Rename a number of old tq methods that are no longer tq specific

89 files changed, 339 insertions, 339 deletions

diff --git a/adept/adept/acqprogress.cpp b/adept/adept/acqprogress.cpp
index 64b74fe..ff31e8f 100644
--- a/adept/adept/acqprogress.cpp
+++ b/adept/adept/acqprogress.cpp
@@ -34,7 +34,7 @@ AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
 {
     m_pbcol = 0;
     m_prog = new ItemProgress( 0, 0 );
-    m_prog->settqStatus( "waiting" );
+    m_prog->setStatus( "waiting" );
     m_prog->setTotalSteps( 100 );
     m_item = item;
     m_id = m_item.Owner->ID;
@@ -43,9 +43,9 @@ AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
     setText( 1, u8( item.Description ) );
     // cerr << "create: id = " << item . Owner -> ID << ", myId = " << m_item . Owner -> ID << endl;
     if (hit) {
-        m_prog->settqStatus( "hit" );
+        m_prog->setStatus( "hit" );
     } else
-        m_prog->settqStatus( "waiting" );
+        m_prog->setStatus( "waiting" );
     // TQString (SizeToStr (Itm.Owner -> FileSize) . c_str ()) + TQString ("B"),
     // /* TQString (Itm . Owner -> ID) + */ TQString (Itm.Description . c_str ()));
 }
@@ -66,21 +66,21 @@ void AcqStatus::Item::pulse (pkgAcquire::Worker *w)
 {
     if (w) {
         if (w->TotalSize)
-            settqStatus( "progress", long( double(
+            setStatus( "progress", long( double(
                                    w -> CurrentSize * 100.0)
                                / double( w->TotalSize ) ) );
         else
-            settqStatus( "downloading", 0 );
+            setStatus( "downloading", 0 );
     }
 }
 
-void AcqStatus::Item::settqStatus( const std::string &s, int i )
+void AcqStatus::Item::setStatus( const std::string &s, int i )
 {
-    m_prog->settqStatus( s, i );
+    m_prog->setStatus( s, i );
 }
 
 void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
-        int column, int width, int tqalignment )
+        int column, int width, int alignment )
 {
     TQColorGroup _cg( cg );
     TQColor c = _cg.text();
@@ -95,7 +95,7 @@ void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
         TQPixmap pm( width, height() );
         TQPainter _p( &pm );
         _cg.setColor( TQColorGroup::Text, c );
-        KListViewItem::paintCell( &_p, _cg, column, width, tqalignment );
+        KListViewItem::paintCell( &_p, _cg, column, width, alignment );
         p->drawPixmap( 0, 0, pm );
     }
 }
@@ -126,7 +126,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
 {
     Item *i = findItem (Itm);
     if (i) {
-        i->settqStatus( "done" );
+        i->setStatus( "done" );
     }
     emit statusChanged( StWaiting );
     triggerUpdate();
@@ -156,7 +156,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
     Itm.Owner->ID = ID++;
     Item *i = new Item( this, Itm, true );
     // ensureItemVisible( i );
-    i->settqStatus( "hit" );
+    i->setStatus( "hit" );
     m_items.push_back( i );
 
     kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
@@ -199,9 +199,9 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
     if (! i)
         return;
     if (Itm.Owner->Status == pkgAcquire::Item::StatDone) {
-        i->settqStatus( "ignored" );
+        i->setStatus( "ignored" );
     } else {
-        i->settqStatus( "error" );
+        i->setStatus( "error" );
     }
 
     triggerUpdate();
@@ -230,7 +230,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
     }
     
     triggerUpdate ();
-    // tqrepaint ();
+    // repaint ();
     
     if (TotalBytes > 0)
         emit totalProgress(
@@ -253,8 +253,8 @@ bool AcqStatus::MediaChange(string Media,string Drive)
     int res = KMessageBox::warningContinueCancel(
         this, i18n( "Please insert the disc "
                     "labeled '%1' in the drive "
-                    "'%2' and press enter" ).tqarg(
-                        u8( Media ) ).tqarg( u8( Drive ) ),
+                    "'%2' and press enter" ).arg(
+                        u8( Media ) ).arg( u8( Drive ) ),
         i18n( "Media Change" ) );
     if ( res == KMessageBox::Cancel )
         cancel();
@@ -274,11 +274,11 @@ AcqStatusDialog::AcqStatusDialog (TQWidget *parent, const char *name, bool modal
     m_status = new AcqStatus (this, "");
     setMainWidget( m_status.data() );
     enableButton (Ok, false);
-    connect (m_status.data(), TQT_SIGNAL (statusChanged (AcqStatus::tqStatus)),
-             this, TQT_SLOT (statusChange (AcqStatus::tqStatus)));
+    connect (m_status.data(), TQT_SIGNAL (statusChanged (AcqStatus::Status)),
+             this, TQT_SLOT (statusChange (AcqStatus::Status)));
 }
 
-void AcqStatusDialog::statusChange (AcqStatus::tqStatus st)
+void AcqStatusDialog::statusChange (AcqStatus::Status st)
 {
     if (st == AcqStatus::StDownloading || st == AcqStatus::StWaiting) {
         enableButton (Ok, false);
diff --git a/adept/adept/acqprogress.h b/adept/adept/acqprogress.h
index b27d327..e6990af 100644
--- a/adept/adept/acqprogress.h
+++ b/adept/adept/acqprogress.h
@@ -32,7 +32,7 @@ protected:
     public:
         ItemProgress( TQWidget *parent, const char *name = 0 )
             : KProgress( parent, name ), m_spin( 0 ) {}
-        void settqStatus( const std::string &s,
+        void setStatus( const std::string &s,
                         int prog = 0 ) {
             m_status = s;
             if (m_status == "hit"
@@ -67,12 +67,12 @@ protected:
         virtual ~Item ();
 
         virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
-                                int column, int width, int tqalignment);
+                                int column, int width, int alignment);
 
         void setProgress (int);
         virtual int compare (TQListViewItem *i, int col, bool ascend) const;
         virtual void pulse (pkgAcquire::Worker *);
-        void settqStatus( const std::string &, int = 0 );
+        void setStatus( const std::string &, int = 0 );
 
         void setup() {
             KListViewItem::setup();
@@ -86,7 +86,7 @@ protected:
     
 public:
     
-    enum tqStatus { StWaiting, StDownloading, StDone };
+    enum Status { StWaiting, StDownloading, StDone };
     
     AcqStatus (TQWidget *parent, const char *name);
     Item *findItem (pkgAcquire::ItemDesc &Itm);
@@ -107,10 +107,10 @@ public slots:
     void cancel();
 
 signals:
-    void statusChanged (AcqStatus::tqStatus st);
+    void statusChanged (AcqStatus::Status st);
     void totalProgress (int percent);
     
-    //AcqTexttqStatus(unsigned int &ScreenWidth,unsigned int Quiet);
+    //AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
 };
 
 class AcqStatusDialog : public KDialogBase
@@ -123,7 +123,7 @@ public:
     aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); };
     AcqStatusDialog (TQWidget *parent, const char *name, bool modal);
 public slots:
-    void statusChange (AcqStatus::tqStatus st);
+    void statusChange (AcqStatus::Status st);
 };
 }
 #endif
diff --git a/adept/adept/acqprogresswidget.cpp b/adept/adept/acqprogresswidget.cpp
index 9f8ff44..1b28fa5 100644
--- a/adept/adept/acqprogresswidget.cpp
+++ b/adept/adept/acqprogresswidget.cpp
@@ -15,13 +15,13 @@ AcqProgressWidget::AcqProgressWidget( TQWidget *parent, const char *name )
     m_progress->setProgress( 0 );
     connect(m_status, TQT_SIGNAL( totalProgress( int ) ),
              this, TQT_SLOT( setProgress( int ) ) );
-    connect(m_status, TQT_SIGNAL( statusChanged( AcqStatus::tqStatus ) ),
-            this, TQT_SLOT( statusChange( AcqStatus::tqStatus ) ) );
+    connect(m_status, TQT_SIGNAL( statusChanged( AcqStatus::Status ) ),
+            this, TQT_SLOT( statusChange( AcqStatus::Status ) ) );
     connect( m_cancel, TQT_SIGNAL( clicked() ),
              m_status, TQT_SLOT( cancel() ) );
 }
 
-void AcqProgressWidget::statusChange( AcqStatus::tqStatus s )
+void AcqProgressWidget::statusChange( AcqStatus::Status s )
 {
     TQString t;
     switch (s) {
diff --git a/adept/adept/acqprogresswidget.h b/adept/adept/acqprogresswidget.h
index 375898f..0db0b8c 100644
--- a/adept/adept/acqprogresswidget.h
+++ b/adept/adept/acqprogresswidget.h
@@ -19,7 +19,7 @@ public:
     AcqProgressWidget (TQWidget *parent = 0, const char *name = 0);
     aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
 public slots:
-    void statusChange( AcqStatus::tqStatus );
+    void statusChange( AcqStatus::Status );
     void setProgress( int );
 protected:
     aptFront::SharedPtr<AcqStatus> m_statusRef;
diff --git a/adept/adept/acqprogresswidgetui.ui b/adept/adept/acqprogresswidgetui.ui
index d572eec..abb9aae 100644
--- a/adept/adept/acqprogresswidgetui.ui
+++ b/adept/adept/acqprogresswidgetui.ui
@@ -26,7 +26,7 @@
             <property name="name">
                 <cstring>m_status</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>300</width>
                     <height>150</height>
diff --git a/adept/adept/application.cpp b/adept/adept/application.cpp
index 0d9afc2..e7972fe 100644
--- a/adept/adept/application.cpp
+++ b/adept/adept/application.cpp
@@ -305,21 +305,21 @@ void Application::redo() {
 TQString Application::changeString() {
     component::State &s = cache().state();
     return i18n( " Install %1, upgrade %2, remove %3 " )
-        .tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() )
-        .tqarg( s.removeCount() );
+        .arg( s.newInstallCount() ).arg( s.upgradeCount() )
+        .arg( s.removeCount() );
 }
 
 TQString Application::statusString() {
     component::State &s = cache().state();
     return i18n( " %1 installed, %2 upgradable, %3 available " )
-        .tqarg( s.installedCount() ).tqarg( s.upgradableCount() )
-        .tqarg( s.availableCount() );
+        .arg( s.installedCount() ).arg( s.upgradableCount() )
+        .arg( s.availableCount() );
 }
 
 TQString Application::sizesString() {
     TQString dl = cache().state().downloadSizeString();
     TQString inst = cache().state().installSizeString();
-    return i18n( " download: %1, installation: %2 " ).tqarg( dl ).tqarg( inst );
+    return i18n( " download: %1, installation: %2 " ).arg( dl ).arg( inst );
 }
 
 void Application::setStatusBar( KStatusBar *s ) {
diff --git a/adept/adept/commitprogress.cpp b/adept/adept/commitprogress.cpp
index 488fb61..2768a86 100644
--- a/adept/adept/commitprogress.cpp
+++ b/adept/adept/commitprogress.cpp
@@ -4,7 +4,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <kprogress.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <klocale.h>
diff --git a/adept/adept/commitprogressui.ui b/adept/adept/commitprogressui.ui
index 87fff45..cfa4e3f 100644
--- a/adept/adept/commitprogressui.ui
+++ b/adept/adept/commitprogressui.ui
@@ -70,7 +70,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -79,7 +79,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -95,7 +95,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -162,7 +162,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>80</height>
@@ -179,7 +179,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>32</height>
diff --git a/adept/adept/desktopentryui.ui b/adept/adept/desktopentryui.ui
index 211b8cb..961b7f6 100644
--- a/adept/adept/desktopentryui.ui
+++ b/adept/adept/desktopentryui.ui
@@ -37,7 +37,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>32</width>
                     <height>32</height>
@@ -86,7 +86,7 @@
             <property name="text">
                 <string>(description)</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -100,7 +100,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>6</width>
                     <height>20</height>
diff --git a/adept/adept/desktoplist.cpp b/adept/adept/desktoplist.cpp
index c522ff2..fe35fcd 100644
--- a/adept/adept/desktoplist.cpp
+++ b/adept/adept/desktoplist.cpp
@@ -27,16 +27,16 @@ DesktopEntry::DesktopEntry( TQWidget *p, const char *n )
 void DesktopEntry::resize( int w, int h )
 {
     // kdDebug() << "DesktopEntry::resize( " << w << ", " << h << " )" << endl;
-    int margin = tqlayout()->margin() + tqlayout()->spacing() * 2
+    int margin = layout()->margin() + layout()->spacing() * 2
                  + 6 /* spacer */ + m_icon->width() + m_check->width();
-    if ( m_check->isVisible() ) margin += m_check->width() + tqlayout()->spacing();
+    if ( m_check->isVisible() ) margin += m_check->width() + layout()->spacing();
     int hFW1 = m_name->heightForWidth( w - margin );
     int hFW2 = m_description->heightForWidth( w - margin );
     /* kdDebug() << "margin = " << margin << ", hFW1 = " << hFW1 << ", hFW2 = "
        << hFW2 << endl; */
-    int height = 2 * tqlayout()->margin() + tqlayout()->spacing() + hFW1 + hFW2;
-    if ( height < 32 + 2*tqlayout()->margin() /* icon size + margin */ )
-        height = 32 + 2*tqlayout()->margin();
+    int height = 2 * layout()->margin() + layout()->spacing() + hFW1 + hFW2;
+    if ( height < 32 + 2*layout()->margin() /* icon size + margin */ )
+        height = 32 + 2*layout()->margin();
     // m_description->resize( w - margin, m_description->heightForWidth( w - margin ) );
     TQWidget::resize( w, height );
 }
diff --git a/adept/adept/dpkgpm-gui.cpp b/adept/adept/dpkgpm-gui.cpp
index 14282cd..a463c7d 100644
--- a/adept/adept/dpkgpm-gui.cpp
+++ b/adept/adept/dpkgpm-gui.cpp
@@ -197,10 +197,10 @@ void DPkgPM::dpkgMonitor ()
     kapp->processEvents();
 }
 
-void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
 {
     std::string op, msg;
-    aptFront::DPkgPM::updatetqStatus( pkg, ev, r );
+    aptFront::DPkgPM::updateStatus( pkg, ev, r );
     entity::Package p = cache::Global::get().packages().packageByName( pkg );
 
     if ( m_currentOp == OInstall ) {
@@ -250,7 +250,7 @@ void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
     std::cerr << "updateStatus: seen = " << m_seenOpCount
               << ", total = " << m_totalOpCount << std::endl;
     statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount,
-                   u8( msg ).tqarg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
+                   u8( msg ).arg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
 }
 
 }
diff --git a/adept/adept/dpkgpm-gui.h b/adept/adept/dpkgpm-gui.h
index 0c3ce26..a28b740 100644
--- a/adept/adept/dpkgpm-gui.h
+++ b/adept/adept/dpkgpm-gui.h
@@ -47,7 +47,7 @@ public:
     virtual bool Go (int);
     virtual bool forkScript (const char *, bool);
     ExtTerminalInterface *terminal();
-    virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
+    virtual void updateStatus( std::string pkg, std::string ev, std::string r );
  
 public slots:
     void processExitC(const KProcess *p);
diff --git a/adept/adept/dpkgpm.cpp b/adept/adept/dpkgpm.cpp
index 00eb36d..025d50f 100644
--- a/adept/adept/dpkgpm.cpp
+++ b/adept/adept/dpkgpm.cpp
@@ -112,9 +112,9 @@ bool DPkgPM::forkDpkg (char *const argv[])
     close( m_dpkgPipe[1] );
     fcntl( m_dpkgPipe[0], F_SETFL, O_NONBLOCK );
 
-    int tqStatus = 0;
+    int Status = 0;
     int ret = 0;
-    while ((ret = waitpid (Child, &tqStatus, WNOHANG)) != Child) {
+    while ((ret = waitpid (Child, &Status, WNOHANG)) != Child) {
         if (errno == EINTR || ret == 0) {
             dpkgMonitor ();
             usleep (200000); // 0.2 second hang
@@ -131,14 +131,14 @@ bool DPkgPM::forkDpkg (char *const argv[])
     signal(SIGINT,old_SIGINT);
 
     // Check for an error code.
-    if (WIFEXITED(tqStatus) == 0 || WEXITSTATUS(tqStatus) != 0)
+    if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
     {
         runScripts ("DPkg::Post-Invoke", false);
-        if (WIFSIGNALED(tqStatus) != 0 && WTERMSIG(tqStatus) == SIGSEGV)
+        if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV)
             return _error->Error("Sub-process %s received a segmentation fault.", argv [0]);
 
-        if (WIFEXITED(tqStatus) != 0)
-            return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(tqStatus));
+        if (WIFEXITED(Status) != 0)
+            return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(Status));
 
         return _error->Error("Sub-process %s exited unexpectedly", argv[0]);
     }
@@ -313,7 +313,7 @@ void DPkgPM::dpkgMonitor ()
                     r = "";
                 else
                     r = string( r, colon + 2, string::npos );
-                updatetqStatus( p, e, r );
+                updateStatus( p, e, r );
             }
 
             b = string( b, nl + 1, string::npos );
@@ -323,7 +323,7 @@ void DPkgPM::dpkgMonitor ()
     }
 }
 
-void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
 {
    //std::cerr << "DPkgPM::updateStatus " << pkg << " " << ev << " " << r 
    //	     << std::endl;
@@ -336,7 +336,7 @@ void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
       return;
    }
 
-    OpAndtqStatus os = std::make_pair( m_currentOp, ev );
+    OpAndStatus os = std::make_pair( m_currentOp, ev );
     if ( m_seenOps[ std::make_pair( os, pkg ) ] == 0 ) {
         m_seenOpCount++;
         m_seenOps[ std::make_pair( os, pkg ) ] = 1;
diff --git a/adept/adept/dpkgpm.h b/adept/adept/dpkgpm.h
index 37e9001..b899693 100644
--- a/adept/adept/dpkgpm.h
+++ b/adept/adept/dpkgpm.h
@@ -21,8 +21,8 @@ protected:
     int m_scriptPipe[2];
     unsigned m_version;
     std::string m_statusBuffer;
-    typedef std::pair< Op, std::string > OpAndtqStatus;
-    typedef std::map< std::pair< OpAndtqStatus, std::string >, int > SeenOps;
+    typedef std::pair< Op, std::string > OpAndStatus;
+    typedef std::map< std::pair< OpAndStatus, std::string >, int > SeenOps;
     SeenOps m_seenOps;
     int m_totalOpCount;
     int m_seenOpCount;
@@ -39,7 +39,7 @@ public:
     virtual void dpkgMonitor (void);
     virtual bool SendV1Pkgs (FILE *);
     virtual bool feedPackages (void);
-    virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
+    virtual void updateStatus( std::string pkg, std::string ev, std::string r );
 };
 
 }
diff --git a/adept/adept/easytagfilter.h b/adept/adept/easytagfilter.h
index cc39c3d..72710f5 100644
--- a/adept/adept/easytagfilter.h
+++ b/adept/adept/easytagfilter.h
@@ -4,7 +4,7 @@
 */
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdebug.h>
 
 #include <cstddef>
diff --git a/adept/adept/easytagfilterui.ui b/adept/adept/easytagfilterui.ui
index c7bc4ca..14a7b5f 100644
--- a/adept/adept/easytagfilterui.ui
+++ b/adept/adept/easytagfilterui.ui
@@ -43,7 +43,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -68,7 +68,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
@@ -185,7 +185,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/adept/adept/extendablelist.cpp b/adept/adept/extendablelist.cpp
index 199b4d8..4c1451a 100644
--- a/adept/adept/extendablelist.cpp
+++ b/adept/adept/extendablelist.cpp
@@ -98,7 +98,7 @@ void ExtendableList::updateExtender( ExtendableItem *i )
         return;
     }
 
-    // TQRect rect = tqitemRect( i );
+    // TQRect rect = itemRect( i );
     addChild( i->extender(), extenderOffset( i ), itemPos( i ) );
     // addChild( i->extender(), x, rect.y() );
     i->extender()->show();
@@ -106,7 +106,7 @@ void ExtendableList::updateExtender( ExtendableItem *i )
                            i->extender()->height() );
     if ( i->height() != i->extender()->frameSize().height() ) {
         i->setHeight( i->extender()->frameSize().height() );
-        delayedUpdateExtenders(); // re-update since we broke tqlayout
+        delayedUpdateExtenders(); // re-update since we broke layout
     }
 
     i->extender()->setupColors();
@@ -294,23 +294,23 @@ void ExtendableItem::paintBranches( TQPainter *p,
 }
 
 /* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                                int column, int width, int tqalignment )
+                                int column, int width, int alignment )
 {
     TQPixmap pm( width, height() );
     TQPainter _p( &pm );
-    KListViewItem::paintCell( &_p, cg, column, width, tqalignment );
+    KListViewItem::paintCell( &_p, cg, column, width, alignment );
     p->drawPixmap( 0, 0, pm );
     } */
 
 
 static void setcolor( TQWidget *w, ExtendableItem *i ) {
     if ( i->isSelected() && i->list()->extenderHighlight() )
-        w->setPaletteBackgroundColor( w->tqcolorGroup().highlight() );
+        w->setPaletteBackgroundColor( w->colorGroup().highlight() );
     else if ( i->isAlternate() )
         w->setPaletteBackgroundColor(
             KGlobalSettings::alternateBackgroundColor() );
     else
-        w->setPaletteBackgroundColor( w->tqcolorGroup().base() );
+        w->setPaletteBackgroundColor( w->colorGroup().base() );
     // w->setBackgroundMode( TQWidget::PaletteBase );
 }
 void ItemExtender::setupColors()
diff --git a/adept/adept/extendablelist.h b/adept/adept/extendablelist.h
index 3bad5ec..03f8849 100644
--- a/adept/adept/extendablelist.h
+++ b/adept/adept/extendablelist.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include <klistview.h>
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kglobalsettings.h>
 #include <vector>
 
@@ -147,7 +147,7 @@ public:
         setUpdatesEnabled( false );
         TQWidget::resize( w, h );
         setUpdatesEnabled( true );
-        TQWidget::resize( w, tqlayout()->tqminimumSize().height() );
+        TQWidget::resize( w, layout()->minimumSize().height() );
     }
 
     void resize( const TQSize &s ) {
diff --git a/adept/adept/groupeddesktopselector.cpp b/adept/adept/groupeddesktopselector.cpp
index 3edc87d..5da34c0 100644
--- a/adept/adept/groupeddesktopselector.cpp
+++ b/adept/adept/groupeddesktopselector.cpp
@@ -38,7 +38,7 @@ GroupedDesktopSelector::GroupedDesktopSelector( TQWidget *p, const char *n )
     } // *hack*
     
     // AAAA hack
-    TQLayoutIterator li = tqlayout()->iterator();
+    TQLayoutIterator li = layout()->iterator();
     TQHBoxLayout *hbox = 0;
     while ( li.current() != 0 ) {
         hbox = dynamic_cast< TQHBoxLayout * >( li.current() );
diff --git a/adept/adept/installerview.cpp b/adept/adept/installerview.cpp
index ce99ae8..cdc8e46 100644
--- a/adept/adept/installerview.cpp
+++ b/adept/adept/installerview.cpp
@@ -1,6 +1,6 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 #include <kconfig.h>
diff --git a/adept/adept/installerviewui.ui b/adept/adept/installerviewui.ui
index 72a6a53..cba6d5e 100644
--- a/adept/adept/installerviewui.ui
+++ b/adept/adept/installerviewui.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -106,7 +106,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
diff --git a/adept/adept/lister.cpp b/adept/adept/lister.cpp
index ea0ba08..233b8f9 100644
--- a/adept/adept/lister.cpp
+++ b/adept/adept/lister.cpp
@@ -4,7 +4,7 @@
 #include <tqpainter.h>
 #include <tqpushbutton.h>
 #include <tqthread.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqpixmap.h>
 #include <tqheader.h>
 
@@ -402,7 +402,7 @@ TQString ListerItem::text( int column ) const
         switch (column) {
 
         case Lister::ColPackage: return u8( p.name( u8( i18n( "n/a" ) ) ) );
-        case Lister::ColtqStatus: return u8( p.statusString( u8( i18n( "n/a" ) ) ) );
+        case Lister::ColStatus: return u8( p.statusString( u8( i18n( "n/a" ) ) ) );
         case Lister::ColRequested: return u8( p.actionString( u8( i18n( "n/a" ) ) ) );
         case Lister::ColDescription: return u8( p.shortDescription( u8( i18n( "n/a" ) ) ) );
             // case 2: return p.candidateVersion().versionString();
@@ -448,7 +448,7 @@ ListerItem::~ListerItem()
 }
 
 void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg,
-                             int column, int width, int tqalignment )
+                             int column, int width, int alignment )
 {
     if ( width <= 0 )
         return;
@@ -460,7 +460,7 @@ void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg,
         entity::Package p = entity();
 
         // Paint the status column
-        if ( column == Lister::ColtqStatus ) {
+        if ( column == Lister::ColStatus ) {
             c = statusColor( p );
         }
 
@@ -473,10 +473,10 @@ void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg,
     if ( extender() ) { // make the icon appear at top... this
                         // probably breaks big-text displays?
                         // --> somewhat, but not too badly
-        tqalignment &= ~AlignVertical_Mask;
-        tqalignment |= AlignTop;
+        alignment &= ~AlignVertical_Mask;
+        alignment |= AlignTop;
     }
-    KListViewItem::paintCell( &_p, _cg, column, width, tqalignment );
+    KListViewItem::paintCell( &_p, _cg, column, width, alignment );
     p->drawPixmap( 0, 0, pm );
 }
 
@@ -544,7 +544,7 @@ ListerItemExtender::ListerItemExtender( TQWidget *parent, const char * n)
              this, TQT_SLOT( detailsClicked() ) );
 
     m_packageInfo->adjustFontSize( -1 );
-    m_packageInfo->hidetqStatus();
+    m_packageInfo->hideStatus();
 }
 
 void ListerItemExtender::detailsClicked() {
@@ -558,7 +558,7 @@ ListerItem *ListerItemExtender::item()
 
 void ListerItemExtender::mouseReleaseEvent( TQMouseEvent *e ) {
     e->ignore();
-    if ( tqchildAt( e->pos() ) != static_cast< TQWidget * >( m_name ) )
+    if ( childAt( e->pos() ) != static_cast< TQWidget * >( m_name ) )
         e->accept();
 }
 void ListerItemExtender::setItem( ExtendableItem *i )
@@ -669,13 +669,13 @@ void ListerItemExtender::resize( int w, int h )
 {
     // XXX the magic constants are probably style-dependent... AW
     int namew = - item()->lister()->extenderOffset( item() )
-                - tqlayout()->margin()
-                - tqlayout()->spacing()
+                - layout()->margin()
+                - layout()->spacing()
                 + item()->lister()->columnWidth( 0 );
-    int statw = item()->lister()->columnWidth( Lister::ColtqStatus )
-                - tqlayout()->spacing();
+    int statw = item()->lister()->columnWidth( Lister::ColStatus )
+                - layout()->spacing();
     int chw = item()->lister()->columnWidth( Lister::ColRequested )
-              - tqlayout()->spacing() - 3; // wth...
+              - layout()->spacing() - 3; // wth...
     m_name->setMinimumWidth( namew );
     m_status->setMinimumWidth( statw );
     m_change->setMinimumWidth( chw );
@@ -776,7 +776,7 @@ void ListerTooltip::maybeTip( const TQPoint &pt )
     str += format( i18n( "Candidate&nbsp;Version:" ), cand );
 
     str.append( u8( "</qt>" ) );
-    tip( m_parent->tqitemRect( x ), str );
+    tip( m_parent->itemRect( x ), str );
 }
 
 void ListerItemTooltip::maybeTip(const TQPoint& pt) {
@@ -800,7 +800,7 @@ void ListerItemTooltip::maybeTip(const TQPoint& pt) {
     }
 
     // Grab the item rectangle
-    const TQRect irect = m_parent->tqitemRect(item);
+    const TQRect irect = m_parent->itemRect(item);
     if (!irect.isValid()) {
         return;
     }
diff --git a/adept/adept/lister.h b/adept/adept/lister.h
index a281fb4..03506ab 100644
--- a/adept/adept/lister.h
+++ b/adept/adept/lister.h
@@ -50,12 +50,12 @@ public:
   static const int ColPackage     = 0;
 #ifdef KUBUNTU
   static const int ColIcon        = 1;
-  static const int ColtqStatus      = 2;
+  static const int ColStatus      = 2;
   static const int ColRequested   = 3;
   static const int ColDescription = 4;
   static const int ColLast        = 4;
 #else
-  static const int ColtqStatus      = 1;
+  static const int ColStatus      = 1;
   static const int ColRequested   = 2;
   static const int ColDescription = 3;
   static const int ColLast        = 3;
@@ -238,7 +238,7 @@ public:
     entity::Entity entity() { return m_entity; }
     const entity::Entity entity() const { return m_entity; }
     virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment);
+                            int column, int width, int alignment);
     virtual bool less( const ExtendableItem * ) const;
     Lister *lister() {
         return dynamic_cast< Lister* >( listView() );
diff --git a/adept/adept/listerextenderui.ui b/adept/adept/listerextenderui.ui
index 27d42c0..c3a877c 100644
--- a/adept/adept/listerextenderui.ui
+++ b/adept/adept/listerextenderui.ui
@@ -35,7 +35,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>4</width>
                     <height>4</height>
@@ -52,7 +52,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>4</width>
                     <height>4</height>
@@ -61,7 +61,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -85,7 +85,7 @@
                     <property name="text">
                         <string>name</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -123,7 +123,7 @@
                     <property name="text">
                         <string>status</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -148,7 +148,7 @@
                     <property name="text">
                         <string>change</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -182,7 +182,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -204,7 +204,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>10</width>
                             <height>20</height>
@@ -237,7 +237,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>10</width>
                             <height>20</height>
@@ -250,7 +250,7 @@
             <property name="name">
                 <cstring>m_packageInfo</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>80</height>
@@ -267,7 +267,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>1</width>
                     <height>20</height>
diff --git a/adept/adept/packagedetails.cpp b/adept/adept/packagedetails.cpp
index 4f1908a..82e0474 100644
--- a/adept/adept/packagedetails.cpp
+++ b/adept/adept/packagedetails.cpp
@@ -1,5 +1,5 @@
 #include <tqtoolbutton.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -44,7 +44,7 @@ PackageDetails::PackageDetails( TQWidget *w, const char *n )
     m_lister->setRangeProvider( this ); // wee
     // m_lister->setOpenToplevel( true );
 
-    m_description->setPaper( TQBrush( tqcolorGroup().background() ) );
+    m_description->setPaper( TQBrush( colorGroup().background() ) );
 
     connect( m_toolbar->getButton( BShow ), TQT_SIGNAL( clicked() ),
              this, TQT_SIGNAL( showList() ) );
diff --git a/adept/adept/packagedetailsui.ui b/adept/adept/packagedetailsui.ui
index b94120c..9cbe245 100644
--- a/adept/adept/packagedetailsui.ui
+++ b/adept/adept/packagedetailsui.ui
@@ -83,7 +83,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>75</height>
@@ -100,7 +100,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -125,7 +125,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -150,7 +150,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -231,7 +231,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>0</width>
                                 <height>120</height>
@@ -284,7 +284,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>200</width>
                                 <height>0</height>
@@ -293,7 +293,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout9</cstring>
+                            <cstring>layout9</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -352,7 +352,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>61</height>
diff --git a/adept/adept/packageinfo.cpp b/adept/adept/packageinfo.cpp
index 0386604..5adf40d 100644
--- a/adept/adept/packageinfo.cpp
+++ b/adept/adept/packageinfo.cpp
@@ -31,7 +31,7 @@ void PackageInfo::adjustFontSize( int s ) {
     adept::adjustFontSize( m_installedVer, s );
 }
 
-void PackageInfo::hidetqStatus() {
+void PackageInfo::hideStatus() {
     m_status->hide();
     m_change->hide();
 }
@@ -77,7 +77,7 @@ TQColor actionColor( entity::Package p )
 /* TQString hexColor( TQColor c )
 {
     TQString r( "#%1%2%3" );
-    return r.tqarg( c.red(), -2, 16 ).tqarg( c.green(), -2, 16 ).tqarg( c.blue(), -2, 16 );
+    return r.arg( c.red(), -2, 16 ).arg( c.green(), -2, 16 ).arg( c.blue(), -2, 16 );
     } */
 
 TQString colorify( TQColor c, TQString s )
diff --git a/adept/adept/packageinfo.h b/adept/adept/packageinfo.h
index 339c4f5..fc43ed1 100644
--- a/adept/adept/packageinfo.h
+++ b/adept/adept/packageinfo.h
@@ -26,7 +26,7 @@ public slots:
 public:
     void notifyPostChange( cache::component::Base * );
     void notifyPostRebuild( cache::component::Base * );
-    void hidetqStatus();
+    void hideStatus();
 protected:
     cache::entity::StableVersion m_version;
     bool m_specificVersion;
diff --git a/adept/adept/packageinfoui.ui b/adept/adept/packageinfoui.ui
index 26ae282..14ceec0 100644
--- a/adept/adept/packageinfoui.ui
+++ b/adept/adept/packageinfoui.ui
@@ -37,13 +37,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>16</width>
                     <height>5</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>16</width>
                     <height>5</height>
@@ -65,7 +65,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -74,7 +74,7 @@
             <property name="text">
                 <string>maintainer</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignBottom</set>
             </property>
         </widget>
diff --git a/adept/adept/quickfilter.h b/adept/adept/quickfilter.h
index 4b72300..3178141 100644
--- a/adept/adept/quickfilter.h
+++ b/adept/adept/quickfilter.h
@@ -4,7 +4,7 @@
 */
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <apt-front/cache/entity/entity.h>
diff --git a/adept/adept/quickfilterui.ui b/adept/adept/quickfilterui.ui
index dd90f08..835b4cf 100644
--- a/adept/adept/quickfilterui.ui
+++ b/adept/adept/quickfilterui.ui
@@ -45,7 +45,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
@@ -62,7 +62,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>21</height>
diff --git a/adept/adept/sourceseditor.cpp b/adept/adept/sourceseditor.cpp
index 28a9d8e..8755968 100644
--- a/adept/adept/sourceseditor.cpp
+++ b/adept/adept/sourceseditor.cpp
@@ -150,7 +150,7 @@ void EntryItem::setText( int c, const TQString &_s )
 }
 
 void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment )
+                            int column, int width, int alignment )
 {
     TQColorGroup _cg( cg );
     TQColor c = _cg.text();
diff --git a/adept/adept/sourceseditor.h b/adept/adept/sourceseditor.h
index 295f3fa..7faa1a9 100644
--- a/adept/adept/sourceseditor.h
+++ b/adept/adept/sourceseditor.h
@@ -57,7 +57,7 @@ public:
     TQString text( int c ) const;
     void setText( int c, const TQString &s );
     virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment);
+                            int column, int width, int alignment);
 protected:
     Sources::Entry m_entry;
 };
diff --git a/adept/adept/sourceseditorui.ui b/adept/adept/sourceseditorui.ui
index 0ed83de..b93b384 100644
--- a/adept/adept/sourceseditorui.ui
+++ b/adept/adept/sourceseditorui.ui
@@ -88,7 +88,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -122,7 +122,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/adept/adept/statefilter.h b/adept/adept/statefilter.h
index 726470a..3342308 100644
--- a/adept/adept/statefilter.h
+++ b/adept/adept/statefilter.h
@@ -13,7 +13,7 @@
 #include <adept/lister.h>
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <iostream>
 #include <sstream>
 
diff --git a/adept/adept/statefilterui.ui b/adept/adept/statefilterui.ui
index 295f29d..6ce84d9 100644
--- a/adept/adept/statefilterui.ui
+++ b/adept/adept/statefilterui.ui
@@ -32,13 +32,13 @@
             <property name="text">
                 <string>Show: </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter</set>
             </property>
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -78,7 +78,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>195</width>
                             <height>16</height>
@@ -89,7 +89,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>195</width>
                             <height>16</height>
@@ -153,7 +153,7 @@
             <property name="text">
                 <string>with: </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
diff --git a/adept/adept/tagchooser.h b/adept/adept/tagchooser.h
index 35cafad..a52f423 100644
--- a/adept/adept/tagchooser.h
+++ b/adept/adept/tagchooser.h
@@ -2,7 +2,7 @@
    written by Peter Rockai <me@mornfall.net> */
 
 #include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <apt-front/utils/range.h>
 #include <apt-front/cache/cache.h>
diff --git a/adept/adept/tagfilter.h b/adept/adept/tagfilter.h
index a75c42b..b99f905 100644
--- a/adept/adept/tagfilter.h
+++ b/adept/adept/tagfilter.h
@@ -2,7 +2,7 @@
    written by Peter Rockai <me@mornfall.net> */
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqpoint.h>
 
diff --git a/adept/adept/tagfilterui.ui b/adept/adept/tagfilterui.ui
index 82a8dce..1f78b8a 100644
--- a/adept/adept/tagfilterui.ui
+++ b/adept/adept/tagfilterui.ui
@@ -40,7 +40,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>90</height>
diff --git a/adept/adept/taglist.cpp b/adept/adept/taglist.cpp
index 9879d01..b7029be 100644
--- a/adept/adept/taglist.cpp
+++ b/adept/adept/taglist.cpp
@@ -24,7 +24,7 @@ TagLabel::TagLabel( Tag t, TagList *l, TQWidget *p, const char *n )
     } else {
         m_remove = new TQLabel( this );
         m_remove->setPixmap( SmallIcon( u8( "cancel" ) ) );
-        m_remove->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+        m_remove->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
         m_description = new TQLabel(  TQString( " [" ) + t.fullname( "n/a" ) + "] "
                                      + t.shortDescription( "n/a" ), this );
     }
@@ -33,7 +33,7 @@ TagLabel::TagLabel( Tag t, TagList *l, TQWidget *p, const char *n )
 void TagLabel::mouseReleaseEvent( TQMouseEvent *e ) {
     using namespace wibble::operators;
     if ( e->button() == Qt::LeftButton &&
-         dynamic_cast< TQLabel * >( tqchildAt( e->pos() ) ) == m_remove )
+         dynamic_cast< TQLabel * >( childAt( e->pos() ) ) == m_remove )
         m_list->setTags( m_list->tags() - m_tag );
 }
 
@@ -92,7 +92,7 @@ void TagList::updateList()
             appendLabel( new TagLabel( *i, this, m_tagBox ) );
         }
     }
-    m_tagBox->tqlayout()->addItem( m_tagSpacer );
+    m_tagBox->layout()->addItem( m_tagSpacer );
     update();
     parentWidget()->adjustSize();
     m_updateScheduled = false;
@@ -105,7 +105,7 @@ void TagList::appendLabel( TagLabel *l )
 }
 
 void TagList::mouseMoveEvent( TQMouseEvent *e ) {
-    TagLabel *child = dynamic_cast< TagLabel * >( tqchildAt( e->pos() )->parentWidget() );
+    TagLabel *child = dynamic_cast< TagLabel * >( childAt( e->pos() )->parentWidget() );
     if ( !child )
         return;
     TQDragObject *d = new TQTextDrag( child->tag().fullname( "" ), this );
@@ -134,5 +134,5 @@ void TagList::clearList()
         delete *i;
     }
     m_list.clear();
-    m_tagBox->tqlayout()->removeItem( m_tagSpacer );
+    m_tagBox->layout()->removeItem( m_tagSpacer );
 }
diff --git a/adept/adept/taglist.h b/adept/adept/taglist.h
index c325c5e..6b4e447 100644
--- a/adept/adept/taglist.h
+++ b/adept/adept/taglist.h
@@ -6,7 +6,7 @@
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kiconloader.h>
 #include <vector>
diff --git a/adept/batch/app.cpp b/adept/batch/app.cpp
index 140e4d6..efe0e54 100644
--- a/adept/batch/app.cpp
+++ b/adept/batch/app.cpp
@@ -67,7 +67,7 @@ App::App( KCmdLineArgs *args ) {
           qs_pkgname = a;
           kdDebug() << "The package '"<<a<<"' could not be found." << endl;
           KMessageBox::sorry(
-                             this, i18n( "The package '%1' could not be found." ).tqarg(u8(qs_pkgname)),
+                             this, i18n( "The package '%1' could not be found." ).arg(u8(qs_pkgname)),
                              i18n( "Could not commit changes" ) );
           exit(1);
         }
diff --git a/adept/installer/app.cpp b/adept/installer/app.cpp
index 00cf4ca..e85c576 100644
--- a/adept/installer/app.cpp
+++ b/adept/installer/app.cpp
@@ -105,7 +105,7 @@ App::App() {
     m_stack = new TQWidgetStack( m_all );
 
     m_stack->addWidget( m_loading = new TQLabel( i18n( "Loading, please wait..." ), m_stack ) );
-    m_loading->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_loading->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 
     m_buttons = new TQHBox( m_all );
     m_editSources = new KPushButton( i18n( "Edit Software Sources" ), m_buttons );
@@ -121,10 +121,10 @@ App::App() {
     m_buttons->setSpacing( 2 );
     m_buttons->setMargin( 2 );
     TQSizePolicy buttons( TQSizePolicy::Preferred, TQSizePolicy::Fixed, false );
-    m_buttons->tqsetSizePolicy( buttons );
-    m_next->tqsetSizePolicy( buttons );
-    m_quit->tqsetSizePolicy( buttons );
-    space->tqsetSizePolicy( TQSizePolicy(
+    m_buttons->setSizePolicy( buttons );
+    m_next->setSizePolicy( buttons );
+    m_quit->setSizePolicy( buttons );
+    space->setSizePolicy( TQSizePolicy(
                                TQSizePolicy::Expanding,
                                TQSizePolicy::Fixed, false ) );
 
@@ -180,7 +180,7 @@ void App::delayed() {
 
     m_stack->addWidget(
         m_bye = new TQLabel( i18n( "Installation Complete!" ), m_stack ) );
-    m_bye->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_bye->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 
     m_stack->addWidget( m_progress = new adept::AcqProgressWidget( m_stack ) );
     m_stack->addWidget( m_commitProgress = new CommitProgress( m_stack ) );
@@ -210,23 +210,23 @@ bool App::confirmRequest( entity::Package p, component::State::Action a )
     KDialogBase *db = new KDialogBase( KDialogBase::Plain, i18n( "Confirm action" ),
                                        KDialogBase::Ok | KDialogBase::Cancel,
                                        KDialogBase::Ok, this );
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( db->plainPage() );
-    tqlayout->setSpacing( 4 );
-    // db->plainPage()->setLayout( tqlayout = new TQVBoxLayout( db->plainPage() ) );
+    TQVBoxLayout *layout = new TQVBoxLayout( db->plainPage() );
+    layout->setSpacing( 4 );
+    // db->plainPage()->setLayout( layout = new TQVBoxLayout( db->plainPage() ) );
     // TQVBox *vb = new TQVBox( db );
     TQLabel *txt = new TQLabel( db->plainPage() );
-    txt->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
+    txt->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
     txt->setMinimumWidth( 500 );
     txt->setText( t );
     txt->setFixedHeight( txt->heightForWidth( 320 ) );
-    txt->tqsetSizePolicy( TQSizePolicy(
+    txt->setSizePolicy( TQSizePolicy(
                             TQSizePolicy::Expanding, TQSizePolicy::Fixed, false ) );
     DesktopList *l = new DesktopList( db->plainPage() );
     l->setMinimumHeight( 220 );
     l->setMinimumWidth( 320 );
     l->setDisplayCheckboxes( false );
-    tqlayout->addWidget( txt );
-    tqlayout->addWidget( l );
+    layout->addWidget( txt );
+    layout->addWidget( l );
     l->insertRange( filteredRange( d.entries(),
                                    Adaptor( &entity::Desktop::package, p ) ) );
     db->adjustSize();
diff --git a/adept/kubuntu_upgrader/errordialogbase.ui b/adept/kubuntu_upgrader/errordialogbase.ui
index 480a70f..cfd0e22 100644
--- a/adept/kubuntu_upgrader/errordialogbase.ui
+++ b/adept/kubuntu_upgrader/errordialogbase.ui
@@ -35,7 +35,7 @@
             <property name="text">
                 <string>&lt;p align="center"&gt;&lt;/p&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
diff --git a/adept/kubuntu_upgrader/upgradewizard.cpp b/adept/kubuntu_upgrader/upgradewizard.cpp
index c715d90..a448c62 100644
--- a/adept/kubuntu_upgrader/upgradewizard.cpp
+++ b/adept/kubuntu_upgrader/upgradewizard.cpp
@@ -30,15 +30,15 @@
 #include <tqwizard.h>
 #include <tqwidget.h>
 #include <tqpushbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqmime.h>
 #include <tqstring.h>
 #include <tqdialog.h>
 #include <tqlabel.h>
 #include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqptrlist.h>
 #include <tqdir.h>
 
diff --git a/adept/kubuntu_upgrader/upgradewizardbase.ui b/adept/kubuntu_upgrader/upgradewizardbase.ui
index 439a113..b0b7425 100644
--- a/adept/kubuntu_upgrader/upgradewizardbase.ui
+++ b/adept/kubuntu_upgrader/upgradewizardbase.ui
@@ -34,7 +34,7 @@
                 <property name="text">
                     <string>A new distribution version is available! Click next if you wish to upgrade now.</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -48,7 +48,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>271</height>
@@ -115,7 +115,7 @@
                 <property name="text">
                     <string>Ready to upgrade! Click finish to close the Adept Package Manager and launch the distribution upgrade tool.</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -129,7 +129,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>231</height>
diff --git a/adept/libadept/acqprogress.cpp b/adept/libadept/acqprogress.cpp
index 332c60a..ff31e8f 100644
--- a/adept/libadept/acqprogress.cpp
+++ b/adept/libadept/acqprogress.cpp
@@ -34,7 +34,7 @@ AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
 {
     m_pbcol = 0;
     m_prog = new ItemProgress( 0, 0 );
-    m_prog->settqStatus( "waiting" );
+    m_prog->setStatus( "waiting" );
     m_prog->setTotalSteps( 100 );
     m_item = item;
     m_id = m_item.Owner->ID;
@@ -43,9 +43,9 @@ AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
     setText( 1, u8( item.Description ) );
     // cerr << "create: id = " << item . Owner -> ID << ", myId = " << m_item . Owner -> ID << endl;
     if (hit) {
-        m_prog->settqStatus( "hit" );
+        m_prog->setStatus( "hit" );
     } else
-        m_prog->settqStatus( "waiting" );
+        m_prog->setStatus( "waiting" );
     // TQString (SizeToStr (Itm.Owner -> FileSize) . c_str ()) + TQString ("B"),
     // /* TQString (Itm . Owner -> ID) + */ TQString (Itm.Description . c_str ()));
 }
@@ -66,21 +66,21 @@ void AcqStatus::Item::pulse (pkgAcquire::Worker *w)
 {
     if (w) {
         if (w->TotalSize)
-            settqStatus( "progress", long( double(
+            setStatus( "progress", long( double(
                                    w -> CurrentSize * 100.0)
                                / double( w->TotalSize ) ) );
         else
-            settqStatus( "downloading", 0 );
+            setStatus( "downloading", 0 );
     }
 }
 
-void AcqStatus::Item::settqStatus( const std::string &s, int i )
+void AcqStatus::Item::setStatus( const std::string &s, int i )
 {
-    m_prog->settqStatus( s, i );
+    m_prog->setStatus( s, i );
 }
 
 void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
-        int column, int width, int tqalignment )
+        int column, int width, int alignment )
 {
     TQColorGroup _cg( cg );
     TQColor c = _cg.text();
@@ -95,7 +95,7 @@ void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
         TQPixmap pm( width, height() );
         TQPainter _p( &pm );
         _cg.setColor( TQColorGroup::Text, c );
-        KListViewItem::paintCell( &_p, _cg, column, width, tqalignment );
+        KListViewItem::paintCell( &_p, _cg, column, width, alignment );
         p->drawPixmap( 0, 0, pm );
     }
 }
@@ -126,7 +126,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
 {
     Item *i = findItem (Itm);
     if (i) {
-        i->settqStatus( "done" );
+        i->setStatus( "done" );
     }
     emit statusChanged( StWaiting );
     triggerUpdate();
@@ -156,7 +156,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
     Itm.Owner->ID = ID++;
     Item *i = new Item( this, Itm, true );
     // ensureItemVisible( i );
-    i->settqStatus( "hit" );
+    i->setStatus( "hit" );
     m_items.push_back( i );
 
     kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
@@ -186,10 +186,10 @@ void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
 void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
     // item failed to download
 {
-    kdDebug() << "fail, status = " << Itm.Owner->tqStatus
+    kdDebug() << "fail, status = " << Itm.Owner->Status
               << " ID = " << Itm.Owner->ID << endl;
     // Ignore certain kinds of transient failures (bad code)
-    if (Itm.Owner->tqStatus == pkgAcquire::Item::StatIdle) {
+    if (Itm.Owner->Status == pkgAcquire::Item::StatIdle) {
         kdDebug() << "fail with StatIdle, ignoring" << endl;
         return;
     }
@@ -198,10 +198,10 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
     kdDebug() << "fail, i = " << i << endl;
     if (! i)
         return;
-    if (Itm.Owner->tqStatus == pkgAcquire::Item::StatDone) {
-        i->settqStatus( "ignored" );
+    if (Itm.Owner->Status == pkgAcquire::Item::StatDone) {
+        i->setStatus( "ignored" );
     } else {
-        i->settqStatus( "error" );
+        i->setStatus( "error" );
     }
 
     triggerUpdate();
@@ -230,7 +230,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
     }
     
     triggerUpdate ();
-    // tqrepaint ();
+    // repaint ();
     
     if (TotalBytes > 0)
         emit totalProgress(
@@ -253,8 +253,8 @@ bool AcqStatus::MediaChange(string Media,string Drive)
     int res = KMessageBox::warningContinueCancel(
         this, i18n( "Please insert the disc "
                     "labeled '%1' in the drive "
-                    "'%2' and press enter" ).tqarg(
-                        u8( Media ) ).tqarg( u8( Drive ) ),
+                    "'%2' and press enter" ).arg(
+                        u8( Media ) ).arg( u8( Drive ) ),
         i18n( "Media Change" ) );
     if ( res == KMessageBox::Cancel )
         cancel();
@@ -274,11 +274,11 @@ AcqStatusDialog::AcqStatusDialog (TQWidget *parent, const char *name, bool modal
     m_status = new AcqStatus (this, "");
     setMainWidget( m_status.data() );
     enableButton (Ok, false);
-    connect (m_status.data(), TQT_SIGNAL (statusChanged (AcqStatus::tqStatus)),
-             this, TQT_SLOT (statusChange (AcqStatus::tqStatus)));
+    connect (m_status.data(), TQT_SIGNAL (statusChanged (AcqStatus::Status)),
+             this, TQT_SLOT (statusChange (AcqStatus::Status)));
 }
 
-void AcqStatusDialog::statusChange (AcqStatus::tqStatus st)
+void AcqStatusDialog::statusChange (AcqStatus::Status st)
 {
     if (st == AcqStatus::StDownloading || st == AcqStatus::StWaiting) {
         enableButton (Ok, false);
diff --git a/adept/libadept/acqprogress.h b/adept/libadept/acqprogress.h
index b27d327..e6990af 100644
--- a/adept/libadept/acqprogress.h
+++ b/adept/libadept/acqprogress.h
@@ -32,7 +32,7 @@ protected:
     public:
         ItemProgress( TQWidget *parent, const char *name = 0 )
             : KProgress( parent, name ), m_spin( 0 ) {}
-        void settqStatus( const std::string &s,
+        void setStatus( const std::string &s,
                         int prog = 0 ) {
             m_status = s;
             if (m_status == "hit"
@@ -67,12 +67,12 @@ protected:
         virtual ~Item ();
 
         virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
-                                int column, int width, int tqalignment);
+                                int column, int width, int alignment);
 
         void setProgress (int);
         virtual int compare (TQListViewItem *i, int col, bool ascend) const;
         virtual void pulse (pkgAcquire::Worker *);
-        void settqStatus( const std::string &, int = 0 );
+        void setStatus( const std::string &, int = 0 );
 
         void setup() {
             KListViewItem::setup();
@@ -86,7 +86,7 @@ protected:
     
 public:
     
-    enum tqStatus { StWaiting, StDownloading, StDone };
+    enum Status { StWaiting, StDownloading, StDone };
     
     AcqStatus (TQWidget *parent, const char *name);
     Item *findItem (pkgAcquire::ItemDesc &Itm);
@@ -107,10 +107,10 @@ public slots:
     void cancel();
 
 signals:
-    void statusChanged (AcqStatus::tqStatus st);
+    void statusChanged (AcqStatus::Status st);
     void totalProgress (int percent);
     
-    //AcqTexttqStatus(unsigned int &ScreenWidth,unsigned int Quiet);
+    //AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
 };
 
 class AcqStatusDialog : public KDialogBase
@@ -123,7 +123,7 @@ public:
     aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); };
     AcqStatusDialog (TQWidget *parent, const char *name, bool modal);
 public slots:
-    void statusChange (AcqStatus::tqStatus st);
+    void statusChange (AcqStatus::Status st);
 };
 }
 #endif
diff --git a/adept/libadept/acqprogresswidget.cpp b/adept/libadept/acqprogresswidget.cpp
index 9f8ff44..1b28fa5 100644
--- a/adept/libadept/acqprogresswidget.cpp
+++ b/adept/libadept/acqprogresswidget.cpp
@@ -15,13 +15,13 @@ AcqProgressWidget::AcqProgressWidget( TQWidget *parent, const char *name )
     m_progress->setProgress( 0 );
     connect(m_status, TQT_SIGNAL( totalProgress( int ) ),
              this, TQT_SLOT( setProgress( int ) ) );
-    connect(m_status, TQT_SIGNAL( statusChanged( AcqStatus::tqStatus ) ),
-            this, TQT_SLOT( statusChange( AcqStatus::tqStatus ) ) );
+    connect(m_status, TQT_SIGNAL( statusChanged( AcqStatus::Status ) ),
+            this, TQT_SLOT( statusChange( AcqStatus::Status ) ) );
     connect( m_cancel, TQT_SIGNAL( clicked() ),
              m_status, TQT_SLOT( cancel() ) );
 }
 
-void AcqProgressWidget::statusChange( AcqStatus::tqStatus s )
+void AcqProgressWidget::statusChange( AcqStatus::Status s )
 {
     TQString t;
     switch (s) {
diff --git a/adept/libadept/acqprogresswidget.h b/adept/libadept/acqprogresswidget.h
index 375898f..0db0b8c 100644
--- a/adept/libadept/acqprogresswidget.h
+++ b/adept/libadept/acqprogresswidget.h
@@ -19,7 +19,7 @@ public:
     AcqProgressWidget (TQWidget *parent = 0, const char *name = 0);
     aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
 public slots:
-    void statusChange( AcqStatus::tqStatus );
+    void statusChange( AcqStatus::Status );
     void setProgress( int );
 protected:
     aptFront::SharedPtr<AcqStatus> m_statusRef;
diff --git a/adept/libadept/acqprogresswidgetui.ui b/adept/libadept/acqprogresswidgetui.ui
index d572eec..abb9aae 100644
--- a/adept/libadept/acqprogresswidgetui.ui
+++ b/adept/libadept/acqprogresswidgetui.ui
@@ -26,7 +26,7 @@
             <property name="name">
                 <cstring>m_status</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>300</width>
                     <height>150</height>
diff --git a/adept/libadept/application.cpp b/adept/libadept/application.cpp
index 7f836bf..71bbbbe 100644
--- a/adept/libadept/application.cpp
+++ b/adept/libadept/application.cpp
@@ -153,21 +153,21 @@ void Application::redo() {
 TQString Application::changeString() {
     component::State &s = cache().state();
     return i18n( " Install %1, upgrade %2, remove %3 " )
-        .tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() )
-        .tqarg( s.removeCount() );
+        .arg( s.newInstallCount() ).arg( s.upgradeCount() )
+        .arg( s.removeCount() );
 }
 
 TQString Application::statusString() {
     component::State &s = cache().state();
     return i18n( " %1 installed, %2 upgradable, %3 available " )
-        .tqarg( s.installedCount() ).tqarg( s.upgradableCount() )
-        .tqarg( s.availableCount() );
+        .arg( s.installedCount() ).arg( s.upgradableCount() )
+        .arg( s.availableCount() );
 }
 
 TQString Application::sizesString() {
     TQString dl = cache().state().downloadSizeString();
     TQString inst = cache().state().installSizeString();
-    return i18n( " download: %1, installation: %2 " ).tqarg( dl ).tqarg( inst );
+    return i18n( " download: %1, installation: %2 " ).arg( dl ).arg( inst );
 }
 
 void Application::setStatusBar( KStatusBar *s ) {
diff --git a/adept/libadept/commitprogress.cpp b/adept/libadept/commitprogress.cpp
index 6db8a6f..94bf882 100644
--- a/adept/libadept/commitprogress.cpp
+++ b/adept/libadept/commitprogress.cpp
@@ -4,7 +4,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <kprogress.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <klocale.h>
diff --git a/adept/libadept/commitprogressui.ui b/adept/libadept/commitprogressui.ui
index 87fff45..cfa4e3f 100644
--- a/adept/libadept/commitprogressui.ui
+++ b/adept/libadept/commitprogressui.ui
@@ -70,7 +70,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -79,7 +79,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -95,7 +95,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -162,7 +162,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>80</height>
@@ -179,7 +179,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>32</height>
diff --git a/adept/libadept/desktopentryui.ui b/adept/libadept/desktopentryui.ui
index 211b8cb..961b7f6 100644
--- a/adept/libadept/desktopentryui.ui
+++ b/adept/libadept/desktopentryui.ui
@@ -37,7 +37,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>32</width>
                     <height>32</height>
@@ -86,7 +86,7 @@
             <property name="text">
                 <string>(description)</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -100,7 +100,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>6</width>
                     <height>20</height>
diff --git a/adept/libadept/desktoplist.cpp b/adept/libadept/desktoplist.cpp
index c522ff2..fe35fcd 100644
--- a/adept/libadept/desktoplist.cpp
+++ b/adept/libadept/desktoplist.cpp
@@ -27,16 +27,16 @@ DesktopEntry::DesktopEntry( TQWidget *p, const char *n )
 void DesktopEntry::resize( int w, int h )
 {
     // kdDebug() << "DesktopEntry::resize( " << w << ", " << h << " )" << endl;
-    int margin = tqlayout()->margin() + tqlayout()->spacing() * 2
+    int margin = layout()->margin() + layout()->spacing() * 2
                  + 6 /* spacer */ + m_icon->width() + m_check->width();
-    if ( m_check->isVisible() ) margin += m_check->width() + tqlayout()->spacing();
+    if ( m_check->isVisible() ) margin += m_check->width() + layout()->spacing();
     int hFW1 = m_name->heightForWidth( w - margin );
     int hFW2 = m_description->heightForWidth( w - margin );
     /* kdDebug() << "margin = " << margin << ", hFW1 = " << hFW1 << ", hFW2 = "
        << hFW2 << endl; */
-    int height = 2 * tqlayout()->margin() + tqlayout()->spacing() + hFW1 + hFW2;
-    if ( height < 32 + 2*tqlayout()->margin() /* icon size + margin */ )
-        height = 32 + 2*tqlayout()->margin();
+    int height = 2 * layout()->margin() + layout()->spacing() + hFW1 + hFW2;
+    if ( height < 32 + 2*layout()->margin() /* icon size + margin */ )
+        height = 32 + 2*layout()->margin();
     // m_description->resize( w - margin, m_description->heightForWidth( w - margin ) );
     TQWidget::resize( w, height );
 }
diff --git a/adept/libadept/dpkgpm-gui.cpp b/adept/libadept/dpkgpm-gui.cpp
index 14282cd..a463c7d 100644
--- a/adept/libadept/dpkgpm-gui.cpp
+++ b/adept/libadept/dpkgpm-gui.cpp
@@ -197,10 +197,10 @@ void DPkgPM::dpkgMonitor ()
     kapp->processEvents();
 }
 
-void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
 {
     std::string op, msg;
-    aptFront::DPkgPM::updatetqStatus( pkg, ev, r );
+    aptFront::DPkgPM::updateStatus( pkg, ev, r );
     entity::Package p = cache::Global::get().packages().packageByName( pkg );
 
     if ( m_currentOp == OInstall ) {
@@ -250,7 +250,7 @@ void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
     std::cerr << "updateStatus: seen = " << m_seenOpCount
               << ", total = " << m_totalOpCount << std::endl;
     statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount,
-                   u8( msg ).tqarg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
+                   u8( msg ).arg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
 }
 
 }
diff --git a/adept/libadept/dpkgpm-gui.h b/adept/libadept/dpkgpm-gui.h
index 0c3ce26..a28b740 100644
--- a/adept/libadept/dpkgpm-gui.h
+++ b/adept/libadept/dpkgpm-gui.h
@@ -47,7 +47,7 @@ public:
     virtual bool Go (int);
     virtual bool forkScript (const char *, bool);
     ExtTerminalInterface *terminal();
-    virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
+    virtual void updateStatus( std::string pkg, std::string ev, std::string r );
  
 public slots:
     void processExitC(const KProcess *p);
diff --git a/adept/libadept/dpkgpm.cpp b/adept/libadept/dpkgpm.cpp
index 7756505..b38b5fb 100644
--- a/adept/libadept/dpkgpm.cpp
+++ b/adept/libadept/dpkgpm.cpp
@@ -111,9 +111,9 @@ bool DPkgPM::forkDpkg (char *const argv[])
     close( m_dpkgPipe[1] );
     fcntl( m_dpkgPipe[0], F_SETFL, O_NONBLOCK );
 
-    int tqStatus = 0;
+    int Status = 0;
     int ret = 0;
-    while ((ret = waitpid (Child, &tqStatus, WNOHANG)) != Child) {
+    while ((ret = waitpid (Child, &Status, WNOHANG)) != Child) {
         if (errno == EINTR || ret == 0) {
             dpkgMonitor ();
             usleep (200000); // 0.2 second hang
@@ -130,14 +130,14 @@ bool DPkgPM::forkDpkg (char *const argv[])
     signal(SIGINT,old_SIGINT);
 
     // Check for an error code.
-    if (WIFEXITED(tqStatus) == 0 || WEXITSTATUS(tqStatus) != 0)
+    if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
     {
         runScripts ("DPkg::Post-Invoke", false);
-        if (WIFSIGNALED(tqStatus) != 0 && WTERMSIG(tqStatus) == SIGSEGV)
+        if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV)
             return _error->Error("Sub-process %s received a segmentation fault.", argv [0]);
 
-        if (WIFEXITED(tqStatus) != 0)
-            return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(tqStatus));
+        if (WIFEXITED(Status) != 0)
+            return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(Status));
 
         return _error->Error("Sub-process %s exited unexpectedly", argv[0]);
     }
@@ -312,7 +312,7 @@ void DPkgPM::dpkgMonitor ()
                     r = "";
                 else
                     r = string( r, colon + 2, string::npos );
-                updatetqStatus( p, e, r );
+                updateStatus( p, e, r );
             }
 
             b = string( b, nl + 1, string::npos );
@@ -322,9 +322,9 @@ void DPkgPM::dpkgMonitor ()
     }
 }
 
-void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
 {
-    OpAndtqStatus os = std::make_pair( m_currentOp, ev );
+    OpAndStatus os = std::make_pair( m_currentOp, ev );
     if ( m_seenOps[ std::make_pair( os, pkg ) ] == 0 ) {
         m_seenOpCount++;
         m_seenOps[ std::make_pair( os, pkg ) ] = 1;
diff --git a/adept/libadept/dpkgpm.h b/adept/libadept/dpkgpm.h
index 37e9001..b899693 100644
--- a/adept/libadept/dpkgpm.h
+++ b/adept/libadept/dpkgpm.h
@@ -21,8 +21,8 @@ protected:
     int m_scriptPipe[2];
     unsigned m_version;
     std::string m_statusBuffer;
-    typedef std::pair< Op, std::string > OpAndtqStatus;
-    typedef std::map< std::pair< OpAndtqStatus, std::string >, int > SeenOps;
+    typedef std::pair< Op, std::string > OpAndStatus;
+    typedef std::map< std::pair< OpAndStatus, std::string >, int > SeenOps;
     SeenOps m_seenOps;
     int m_totalOpCount;
     int m_seenOpCount;
@@ -39,7 +39,7 @@ public:
     virtual void dpkgMonitor (void);
     virtual bool SendV1Pkgs (FILE *);
     virtual bool feedPackages (void);
-    virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
+    virtual void updateStatus( std::string pkg, std::string ev, std::string r );
 };
 
 }
diff --git a/adept/libadept/easytagfilter.h b/adept/libadept/easytagfilter.h
index e2f6165..6564938 100644
--- a/adept/libadept/easytagfilter.h
+++ b/adept/libadept/easytagfilter.h
@@ -4,7 +4,7 @@
 */
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdebug.h>
 
 #include <apt-front/cache/entity/entity.h>
diff --git a/adept/libadept/easytagfilterui.ui b/adept/libadept/easytagfilterui.ui
index c7bc4ca..14a7b5f 100644
--- a/adept/libadept/easytagfilterui.ui
+++ b/adept/libadept/easytagfilterui.ui
@@ -43,7 +43,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -68,7 +68,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>20</height>
@@ -185,7 +185,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/adept/libadept/extendablelist.cpp b/adept/libadept/extendablelist.cpp
index c97fa0f..16ebb96 100644
--- a/adept/libadept/extendablelist.cpp
+++ b/adept/libadept/extendablelist.cpp
@@ -94,7 +94,7 @@ void ExtendableList::updateExtender( ExtendableItem *i )
         return;
     }
 
-    // TQRect rect = tqitemRect( i );
+    // TQRect rect = itemRect( i );
     addChild( i->extender(), extenderOffset( i ), itemPos( i ) );
     // addChild( i->extender(), x, rect.y() );
     i->extender()->show();
@@ -102,7 +102,7 @@ void ExtendableList::updateExtender( ExtendableItem *i )
                            i->extender()->height() );
     if ( i->height() != i->extender()->frameSize().height() ) {
         i->setHeight( i->extender()->frameSize().height() );
-        delayedUpdateExtenders(); // re-update since we broke tqlayout
+        delayedUpdateExtenders(); // re-update since we broke layout
     }
 
     i->extender()->setupColors();
@@ -287,23 +287,23 @@ void ExtendableItem::paintBranches( TQPainter *p,
 }
 
 /* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                                int column, int width, int tqalignment )
+                                int column, int width, int alignment )
 {
     TQPixmap pm( width, height() );
     TQPainter _p( &pm );
-    KListViewItem::paintCell( &_p, cg, column, width, tqalignment );
+    KListViewItem::paintCell( &_p, cg, column, width, alignment );
     p->drawPixmap( 0, 0, pm );
     } */
 
 
 static void setcolor( TQWidget *w, ExtendableItem *i ) {
     if ( i->isSelected() && i->list()->extenderHighlight() )
-        w->setPaletteBackgroundColor( w->tqcolorGroup().highlight() );
+        w->setPaletteBackgroundColor( w->colorGroup().highlight() );
     else if ( i->isAlternate() )
         w->setPaletteBackgroundColor(
             KGlobalSettings::alternateBackgroundColor() );
     else
-        w->setPaletteBackgroundColor( w->tqcolorGroup().base() );
+        w->setPaletteBackgroundColor( w->colorGroup().base() );
     // w->setBackgroundMode( TQWidget::PaletteBase );
 }
 void ItemExtender::setupColors()
diff --git a/adept/libadept/extendablelist.h b/adept/libadept/extendablelist.h
index b90e86f..184d958 100644
--- a/adept/libadept/extendablelist.h
+++ b/adept/libadept/extendablelist.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include <klistview.h>
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kglobalsettings.h>
 #include <vector>
 
@@ -146,7 +146,7 @@ public:
         setUpdatesEnabled( false );
         TQWidget::resize( w, h );
         setUpdatesEnabled( true );
-        TQWidget::resize( w, tqlayout()->tqminimumSize().height() );
+        TQWidget::resize( w, layout()->minimumSize().height() );
     }
 
     void resize( const TQSize &s ) {
diff --git a/adept/libadept/groupeddesktopselector.cpp b/adept/libadept/groupeddesktopselector.cpp
index 3edc87d..5da34c0 100644
--- a/adept/libadept/groupeddesktopselector.cpp
+++ b/adept/libadept/groupeddesktopselector.cpp
@@ -38,7 +38,7 @@ GroupedDesktopSelector::GroupedDesktopSelector( TQWidget *p, const char *n )
     } // *hack*
     
     // AAAA hack
-    TQLayoutIterator li = tqlayout()->iterator();
+    TQLayoutIterator li = layout()->iterator();
     TQHBoxLayout *hbox = 0;
     while ( li.current() != 0 ) {
         hbox = dynamic_cast< TQHBoxLayout * >( li.current() );
diff --git a/adept/libadept/installerview.cpp b/adept/libadept/installerview.cpp
index ef9eae3..0a992fc 100644
--- a/adept/libadept/installerview.cpp
+++ b/adept/libadept/installerview.cpp
@@ -1,6 +1,6 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 
diff --git a/adept/libadept/installerviewui.ui b/adept/libadept/installerviewui.ui
index 40b2839..1f8f094 100644
--- a/adept/libadept/installerviewui.ui
+++ b/adept/libadept/installerviewui.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
diff --git a/adept/libadept/lister.cpp b/adept/libadept/lister.cpp
index e864270..81fccd1 100644
--- a/adept/libadept/lister.cpp
+++ b/adept/libadept/lister.cpp
@@ -4,7 +4,7 @@
 #include <tqpainter.h>
 #include <tqpushbutton.h>
 #include <tqthread.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 
 #include <kpopupmenu.h>
 #include <kdebug.h>
@@ -390,7 +390,7 @@ TQString ListerItem::text( int column ) const
 }
 
 void ListerItem::paintCell (TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment )
+                            int column, int width, int alignment )
 {
     if ( width <= 0 )
         return;
@@ -474,7 +474,7 @@ ListerItemExtender::ListerItemExtender( TQWidget *parent, const char * n)
              this, TQT_SLOT( detailsClicked() ) );
 
     m_packageInfo->adjustFontSize( -1 );
-    m_packageInfo->hidetqStatus();
+    m_packageInfo->hideStatus();
 }
 
 void ListerItemExtender::detailsClicked() {
@@ -488,7 +488,7 @@ ListerItem *ListerItemExtender::item()
 
 void ListerItemExtender::mouseReleaseEvent( TQMouseEvent *e ) {
     e->ignore();
-    if ( tqchildAt( e->pos() ) != static_cast< TQWidget * >( m_name ) )
+    if ( childAt( e->pos() ) != static_cast< TQWidget * >( m_name ) )
         e->accept();
 }
 void ListerItemExtender::setItem( ExtendableItem *i )
@@ -596,13 +596,13 @@ bool ListerItemExtender::eventFilter( TQObject *o, TQEvent *e )
 void ListerItemExtender::resize( int w, int h )
 {
     int namew = - item()->lister()->extenderOffset( item() ) - 2
-                - tqlayout()->margin()
-                - tqlayout()->spacing()
+                - layout()->margin()
+                - layout()->spacing()
                 + item()->lister()->columnWidth( 0 );
     int statw = item()->lister()->columnWidth( 1 )
-                - tqlayout()->spacing();
+                - layout()->spacing();
     int chw = item()->lister()->columnWidth( 2 ) - 2
-              - tqlayout()->spacing();
+              - layout()->spacing();
     m_name->setMinimumWidth( namew );
     m_status->setMinimumWidth( statw );
     m_change->setMinimumWidth( chw );
@@ -703,5 +703,5 @@ void ListerTooltip::maybeTip( const TQPoint &pt )
     str += format( i18n( "Candidate&nbsp;Version:" ), cand );
 
     str.append( u8( "</qt>" ) );
-    tip( m_parent->tqitemRect( x ), str );
+    tip( m_parent->itemRect( x ), str );
 }
diff --git a/adept/libadept/lister.h b/adept/libadept/lister.h
index d1acc91..a85a8e1 100644
--- a/adept/libadept/lister.h
+++ b/adept/libadept/lister.h
@@ -199,7 +199,7 @@ public:
     entity::Entity entity() { return m_entity; }
     const entity::Entity entity() const { return m_entity; }
     virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment);
+                            int column, int width, int alignment);
     virtual bool less( const ExtendableItem * ) const;
     Lister *lister() {
         return dynamic_cast< Lister* >( listView() );
diff --git a/adept/libadept/listerextenderui.ui b/adept/libadept/listerextenderui.ui
index 6c04dff..fb57707 100644
--- a/adept/libadept/listerextenderui.ui
+++ b/adept/libadept/listerextenderui.ui
@@ -35,7 +35,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -52,7 +52,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>4</height>
@@ -69,7 +69,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>4</width>
                     <height>20</height>
@@ -78,7 +78,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -102,7 +102,7 @@
                     <property name="text">
                         <string>name</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -124,7 +124,7 @@
                     <property name="text">
                         <string>status</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -149,7 +149,7 @@
                     <property name="text">
                         <string>change</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
@@ -183,7 +183,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -205,7 +205,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>10</width>
                             <height>20</height>
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>10</width>
                             <height>20</height>
@@ -251,7 +251,7 @@
             <property name="name">
                 <cstring>m_packageInfo</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>80</height>
@@ -268,7 +268,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>4</width>
                     <height>20</height>
diff --git a/adept/libadept/packagedetails.cpp b/adept/libadept/packagedetails.cpp
index beb668c..c89d402 100644
--- a/adept/libadept/packagedetails.cpp
+++ b/adept/libadept/packagedetails.cpp
@@ -1,5 +1,5 @@
 #include <tqtoolbutton.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -41,7 +41,7 @@ PackageDetails::PackageDetails( TQWidget *w, const char *n )
     m_lister->setRangeProvider( this ); // wee
     // m_lister->setOpenToplevel( true );
 
-    m_description->setPaper( TQBrush( tqcolorGroup().background() ) );
+    m_description->setPaper( TQBrush( colorGroup().background() ) );
 
     connect( m_toolbar->getButton( BShow ), TQT_SIGNAL( clicked() ),
              this, TQT_SIGNAL( showList() ) );
diff --git a/adept/libadept/packagedetailsui.ui b/adept/libadept/packagedetailsui.ui
index dbd8a3d..2ecd519 100644
--- a/adept/libadept/packagedetailsui.ui
+++ b/adept/libadept/packagedetailsui.ui
@@ -83,7 +83,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>75</height>
@@ -100,7 +100,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -125,7 +125,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -150,7 +150,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -231,7 +231,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>0</width>
                                 <height>120</height>
@@ -284,7 +284,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>200</width>
                                 <height>0</height>
@@ -293,7 +293,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout9</cstring>
+                            <cstring>layout9</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -352,7 +352,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>61</height>
diff --git a/adept/libadept/packageinfo.cpp b/adept/libadept/packageinfo.cpp
index 0386604..5adf40d 100644
--- a/adept/libadept/packageinfo.cpp
+++ b/adept/libadept/packageinfo.cpp
@@ -31,7 +31,7 @@ void PackageInfo::adjustFontSize( int s ) {
     adept::adjustFontSize( m_installedVer, s );
 }
 
-void PackageInfo::hidetqStatus() {
+void PackageInfo::hideStatus() {
     m_status->hide();
     m_change->hide();
 }
@@ -77,7 +77,7 @@ TQColor actionColor( entity::Package p )
 /* TQString hexColor( TQColor c )
 {
     TQString r( "#%1%2%3" );
-    return r.tqarg( c.red(), -2, 16 ).tqarg( c.green(), -2, 16 ).tqarg( c.blue(), -2, 16 );
+    return r.arg( c.red(), -2, 16 ).arg( c.green(), -2, 16 ).arg( c.blue(), -2, 16 );
     } */
 
 TQString colorify( TQColor c, TQString s )
diff --git a/adept/libadept/packageinfo.h b/adept/libadept/packageinfo.h
index 4b2e8a3..e738ace 100644
--- a/adept/libadept/packageinfo.h
+++ b/adept/libadept/packageinfo.h
@@ -25,7 +25,7 @@ public slots:
 public:
     void notifyPostChange( cache::component::Base * );
     void notifyPostRebuild( cache::component::Base * );
-    void hidetqStatus();
+    void hideStatus();
 protected:
     cache::entity::StableVersion m_version;
     bool m_specificVersion;
diff --git a/adept/libadept/packageinfoui.ui b/adept/libadept/packageinfoui.ui
index 26ae282..14ceec0 100644
--- a/adept/libadept/packageinfoui.ui
+++ b/adept/libadept/packageinfoui.ui
@@ -37,13 +37,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>16</width>
                     <height>5</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>16</width>
                     <height>5</height>
@@ -65,7 +65,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -74,7 +74,7 @@
             <property name="text">
                 <string>maintainer</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignBottom</set>
             </property>
         </widget>
diff --git a/adept/libadept/quickfilter.h b/adept/libadept/quickfilter.h
index 4b72300..3178141 100644
--- a/adept/libadept/quickfilter.h
+++ b/adept/libadept/quickfilter.h
@@ -4,7 +4,7 @@
 */
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include <apt-front/cache/entity/entity.h>
diff --git a/adept/libadept/quickfilterui.ui b/adept/libadept/quickfilterui.ui
index dd90f08..835b4cf 100644
--- a/adept/libadept/quickfilterui.ui
+++ b/adept/libadept/quickfilterui.ui
@@ -45,7 +45,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
@@ -62,7 +62,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>21</height>
diff --git a/adept/libadept/sourceseditor.cpp b/adept/libadept/sourceseditor.cpp
index 39c2084..7874b9a 100644
--- a/adept/libadept/sourceseditor.cpp
+++ b/adept/libadept/sourceseditor.cpp
@@ -150,7 +150,7 @@ void EntryItem::setText( int c, const TQString &_s )
 }
 
 void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment )
+                            int column, int width, int alignment )
 {
     TQColorGroup _cg( cg );
     TQColor c = _cg.text();
diff --git a/adept/libadept/sourceseditor.h b/adept/libadept/sourceseditor.h
index 780b40c..2eec7db 100644
--- a/adept/libadept/sourceseditor.h
+++ b/adept/libadept/sourceseditor.h
@@ -56,7 +56,7 @@ public:
     TQString text( int c ) const;
     void setText( int c, const TQString &s );
     virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment);
+                            int column, int width, int alignment);
 protected:
     Sources::Entry m_entry;
 };
diff --git a/adept/libadept/sourceseditorui.ui b/adept/libadept/sourceseditorui.ui
index 0ed83de..b93b384 100644
--- a/adept/libadept/sourceseditorui.ui
+++ b/adept/libadept/sourceseditorui.ui
@@ -88,7 +88,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -122,7 +122,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/adept/libadept/statefilter.h b/adept/libadept/statefilter.h
index cd78904..3b32e6a 100644
--- a/adept/libadept/statefilter.h
+++ b/adept/libadept/statefilter.h
@@ -12,7 +12,7 @@
 #include <adept/lister.h>
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <iostream>
 #include <sstream>
 
diff --git a/adept/libadept/statefilterui.ui b/adept/libadept/statefilterui.ui
index 295f29d..6ce84d9 100644
--- a/adept/libadept/statefilterui.ui
+++ b/adept/libadept/statefilterui.ui
@@ -32,13 +32,13 @@
             <property name="text">
                 <string>Show: </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter</set>
             </property>
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -78,7 +78,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>195</width>
                             <height>16</height>
@@ -89,7 +89,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>195</width>
                             <height>16</height>
@@ -153,7 +153,7 @@
             <property name="text">
                 <string>with: </string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
diff --git a/adept/libadept/tagchooser.h b/adept/libadept/tagchooser.h
index f57e2f1..960d38b 100644
--- a/adept/libadept/tagchooser.h
+++ b/adept/libadept/tagchooser.h
@@ -2,7 +2,7 @@
    written by Peter Rockai <me@mornfall.net> */
 
 #include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <apt-front/utils/range.h>
 #include <apt-front/cache/cache.h>
diff --git a/adept/libadept/tagfilter.h b/adept/libadept/tagfilter.h
index 9c74104..20731f3 100644
--- a/adept/libadept/tagfilter.h
+++ b/adept/libadept/tagfilter.h
@@ -2,7 +2,7 @@
    written by Peter Rockai <me@mornfall.net> */
 
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqpoint.h>
 
diff --git a/adept/libadept/tagfilterui.ui b/adept/libadept/tagfilterui.ui
index 82a8dce..1f78b8a 100644
--- a/adept/libadept/tagfilterui.ui
+++ b/adept/libadept/tagfilterui.ui
@@ -40,7 +40,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>90</height>
diff --git a/adept/libadept/taglist.cpp b/adept/libadept/taglist.cpp
index e234831..13717bc 100644
--- a/adept/libadept/taglist.cpp
+++ b/adept/libadept/taglist.cpp
@@ -22,7 +22,7 @@ TagLabel::TagLabel( Tag t, TagList *l, TQWidget *p, const char *n )
     } else {
         m_remove = new TQLabel( this );
         m_remove->setPixmap( SmallIcon( u8( "cancel" ) ) );
-        m_remove->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+        m_remove->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
         m_description = new TQLabel(  TQString( " [" ) + t.fullname( "n/a" ) + "] "
                                      + t.shortDescription( "n/a" ), this );
     }
@@ -30,7 +30,7 @@ TagLabel::TagLabel( Tag t, TagList *l, TQWidget *p, const char *n )
 
 void TagLabel::mouseReleaseEvent( TQMouseEvent *e ) {
     if ( e->button() == Qt::LeftButton &&
-         dynamic_cast< TQLabel * >( tqchildAt( e->pos() ) ) == m_remove )
+         dynamic_cast< TQLabel * >( childAt( e->pos() ) ) == m_remove )
         m_list->setTags( m_list->tags() - m_tag );
 }
 
@@ -88,7 +88,7 @@ void TagList::updateList()
             appendLabel( new TagLabel( *i, this, m_tagBox ) );
         }
     }
-    m_tagBox->tqlayout()->addItem( m_tagSpacer );
+    m_tagBox->layout()->addItem( m_tagSpacer );
     update();
     parentWidget()->adjustSize();
     m_updateScheduled = false;
@@ -101,7 +101,7 @@ void TagList::appendLabel( TagLabel *l )
 }
 
 void TagList::mouseMoveEvent( TQMouseEvent *e ) {
-    TagLabel *child = dynamic_cast< TagLabel * >( tqchildAt( e->pos() )->parentWidget() );
+    TagLabel *child = dynamic_cast< TagLabel * >( childAt( e->pos() )->parentWidget() );
     if ( !child )
         return;
     TQDragObject *d = new TQTextDrag( child->tag().fullname( "" ), this );
@@ -130,5 +130,5 @@ void TagList::clearList()
         delete *i;
     }
     m_list.clear();
-    m_tagBox->tqlayout()->removeItem( m_tagSpacer );
+    m_tagBox->layout()->removeItem( m_tagSpacer );
 }
diff --git a/adept/libadept/taglist.h b/adept/libadept/taglist.h
index 501e67a..070e93a 100644
--- a/adept/libadept/taglist.h
+++ b/adept/libadept/taglist.h
@@ -6,7 +6,7 @@
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kiconloader.h>
 #include <vector>
diff --git a/adept/manager/app.cpp b/adept/manager/app.cpp
index 21cae1f..14b3c95 100644
--- a/adept/manager/app.cpp
+++ b/adept/manager/app.cpp
@@ -45,7 +45,7 @@ TestApp::TestApp() {
     m_stack = new TQWidgetStack( this );
 
     m_stack->addWidget( m_loading = new TQLabel( i18n( "Loading, please wait..." ), m_stack ) );
-    m_loading->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_loading->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 
     Application::setStatusBar( statusBar() );
 
diff --git a/adept/updater/app.cpp b/adept/updater/app.cpp
index d48fbd2..000b950 100644
--- a/adept/updater/app.cpp
+++ b/adept/updater/app.cpp
@@ -51,7 +51,7 @@ TestApp::TestApp()
     m_stack = new TQWidgetStack( m_all );
 
     m_stack->addWidget( m_loading = new TQLabel( i18n( "Loading, please wait..." ), m_stack ) );
-    m_loading->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_loading->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 
     m_buttons = new TQHBox( m_all );
     TQLabel *space = new TQLabel( m_buttons ); // spacing
@@ -63,10 +63,10 @@ TestApp::TestApp()
     m_buttons->setSpacing( 2 );
     m_buttons->setMargin( 2 );
     TQSizePolicy buttons( TQSizePolicy::Preferred, TQSizePolicy::Fixed, false );
-    m_buttons->tqsetSizePolicy( buttons );
-    m_next->tqsetSizePolicy( buttons );
-    m_quit->tqsetSizePolicy( buttons );
-    space->tqsetSizePolicy( TQSizePolicy(
+    m_buttons->setSizePolicy( buttons );
+    m_next->setSizePolicy( buttons );
+    m_quit->setSizePolicy( buttons );
+    space->setSizePolicy( TQSizePolicy(
                                TQSizePolicy::Expanding,
                                TQSizePolicy::Fixed, false ) );
 
@@ -96,8 +96,8 @@ void TestApp::delayed()
                                             m_stack ) );
     m_stack->addWidget( m_start = new TQLabel( i18n( "Welcome to Adept Updater" ),
                                               m_stack ) );
-    m_bye->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    m_start->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_bye->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_start->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 
     m_list->searchView()->setUpgradeMode();