Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

37 files changed, 242 insertions, 242 deletions

diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index 6d106a484..bbcb7bf23 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule
 
     m_pDesktop = desktop;
     if (desktop == 0L)
-        desktop = KApplication::desktop()->screen();
+        desktop = TQT_TQWIDGET(KApplication::desktop()->screen());
 
     m_Renderer.resize( 1 );
     m_Cache.resize( 1 );
@@ -334,7 +334,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num)
 /*
  * Call this when the desktop has been changed.
  * Desk is in KWin convention: [1..desks], instead of [0..desks-1].
- * 0 repaints the current desktop.
+ * 0 tqrepaints the current desktop.
  */
 void KBackgroundManager::slotChangeDesktop(int desk)
 {
@@ -394,7 +394,7 @@ void KBackgroundManager::slotChangeDesktop(int desk)
 /*
  * Call this when the viewport has been changed.
  * Desk is in KWin convention: [1..desks], instead of [0..desks-1].
- * 0 repaints the current viewport.
+ * 0 tqrepaints the current viewport.
  */
 void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport)
 {
@@ -518,25 +518,25 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
     {
        TQScrollView* sv = dynamic_cast<TQScrollView*>( m_pDesktop );
        if ( sv ) {
-         // Qt eats repaint events in this case :-((
+         // Qt eats tqrepaint events in this case :-((
          sv->viewport()->update();
        }
        m_pDesktop->setErasePixmap(*ep);
-       m_pDesktop->repaint();
+       m_pDesktop->tqrepaint();
        static bool root_cleared = false;
        if( !root_cleared )
        { // clear the root window pixmap set by kdm
           root_cleared = true;
 	  TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
           // but make the pixmap visible until m_pDesktop is visible
-          KApplication::desktop()->screen()->setErasePixmap(*ep);
-          KApplication::desktop()->screen()->erase();
+          TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
+          TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
        }
     }
     else
     {
-        KApplication::desktop()->screen()->setErasePixmap(*ep);
-        KApplication::desktop()->screen()->erase();
+        TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep);
+        TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
     }
 
      // and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -556,8 +556,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
 
 void KBackgroundManager::clearRoot()
 {
-    KApplication::desktop()->screen()->setErasePixmap( TQPixmap());
-    KApplication::desktop()->screen()->erase();
+    TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap());
+    TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
 }
 
 /*
@@ -920,12 +920,12 @@ void KBackgroundManager::setWallpaper(int desk, TQString wallpaper, int mode)
     slotChangeDesktop(sdesk);
 }
 
-void KBackgroundManager::repaintBackground()
+void KBackgroundManager::tqrepaintBackground()
 {
     if (m_pDesktop)
-       m_pDesktop->repaint();
+       m_pDesktop->tqrepaint();
     else
-        KApplication::desktop()->screen()->erase();
+        TQT_TQWIDGET(KApplication::desktop()->screen())->erase();
 }
 
 void KBackgroundManager::desktopResized()
@@ -955,7 +955,7 @@ void KBackgroundManager::desktopResized()
         m_pDesktop->resize( kapp->desktop()->geometry().size());
     // Repaint desktop
     slotChangeDesktop(0);
-    repaintBackground();
+    tqrepaintBackground();
 
     // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly
     TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 5b9bf70f1..2923fd1b5 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -84,7 +84,7 @@ private slots:
     void slotChangeDesktop(int);
     void slotChangeViewport(int, const TQPoint&);
     void slotChangeNumberOfDesktops(int);
-    void repaintBackground();
+    void tqrepaintBackground();
     void desktopResized();
     void clearRoot();
     void saveImages();
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index f923d953d..de58e0d24 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -79,19 +79,19 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
 {
      if (e->type() == TQEvent::MouseButtonPress)
      {
-       TQMouseEvent *me = static_cast<TQMouseEvent *>(e);
+       TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
        KRootWm::self()->mousePressed( me->globalPos(), me->button() );
        return true;
      }
      else if (e->type() == TQEvent::Wheel)
      {
-       TQWheelEvent *we = static_cast<TQWheelEvent *>(e);
+       TQWheelEvent *we = TQT_TQWHEELEVENT(e);
        emit wheelRolled(we->delta());
        return true;
      }
      else if ( e->type() == TQEvent::DragEnter )
      {
-       TQDragEnterEvent* de = static_cast<TQDragEnterEvent *>( e );
+       TQDragEnterEvent* de = static_cast<TQDragEnterEvent*>( e );
        bool b = !KGlobal::config()->isImmutable() && !KGlobal::dirs()->isRestrictedResource( "wallpaper" );
 
        bool imageURL = false;
@@ -136,7 +136,7 @@ const char* KDesktop::m_wheelDirectionStrings[2] = { "Forward", "Reverse" };
 
 KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
     DCOPObject( "KDesktopIface" ),
-    TQWidget( 0L, "desktop", WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0) ),
+    TQWidget( 0L, "desktop", (WFlags)(WResizeNoErase | ( x_root_hack ? (WStyle_Customize | WStyle_NoBorder) : 0)) ),
     // those two WStyle_ break kdesktop when the root-hack isn't used (no Dnd)
    startup_id( NULL ), m_waitForKicker(0)
 {
@@ -153,17 +153,17 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
   setCaption( "KDE Desktop");
 
   setAcceptDrops(true); // WStyle_Customize seems to disable that
-  m_pKwinmodule = new KWinModule( this );
+  m_pKwinmodule = new KWinModule( TQT_TQOBJECT(this) );
 
   kapp->dcopClient()->setNotifications(true);
   kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
                                         "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
 
-  // Dont repaint on configuration changes during construction
+  // Dont tqrepaint on configuration changes during construction
   m_bInit = true;
 
   // It's the child widget that gets the focus, not us
-  setFocusPolicy( NoFocus );
+  setFocusPolicy( TQ_NoFocus );
 
   if ( x_root_hack )
   {
@@ -277,8 +277,8 @@ KDesktop::initRoot()
      m_pIconView->setDragAutoScroll( false );
      m_pIconView->setFrameStyle( TQFrame::NoFrame );
      m_pIconView->viewport()->setBackgroundMode( X11ParentRelative );
-     m_pIconView->setFocusPolicy( StrongFocus );
-     m_pIconView->viewport()->setFocusPolicy( StrongFocus );
+     m_pIconView->setFocusPolicy( TQ_StrongFocus );
+     m_pIconView->viewport()->setFocusPolicy( TQ_StrongFocus );
      m_pIconView->setGeometry( geometry() );
      m_pIconView->show();
 
@@ -356,7 +356,7 @@ KDesktop::backgroundInitDone()
     // avoid flicker
     if (m_bDesktopEnabled)
     {
-       const TQPixmap *bg = TQApplication::desktop()->screen()->backgroundPixmap();
+       const TQPixmap *bg = TQT_TQWIDGET(TQApplication::desktop()->screen())->backgroundPixmap();
        if ( bg )
           m_pIconView->setErasePixmap( *bg );
 
@@ -393,7 +393,7 @@ KDesktop::slotStart()
      m_pIconView->start();
 
   // Global keys
-  keys = new KGlobalAccel( this );
+  keys = new KGlobalAccel( TQT_TQOBJECT(this) );
   (void) new KRootWm( this );
 
 #include "kdesktopbindings.cpp"
@@ -836,7 +836,7 @@ void KDesktop::refresh()
   m_bNeedRepaint |= 1;
   updateWorkArea();
 #endif
-  kapp->dcopClient()->send( kwin_name, "", "refresh()", "");
+  kapp->dcopClient()->send( kwin_name, "", "refresh()", TQString(""));
   refreshIcons();
 }
 
@@ -1160,7 +1160,7 @@ void KDesktop::addIcon(const TQString & _url, int x, int y)
 
 void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int y)
 {
-    TQString filename = _url.mid(_url.findRev('/') + 1);
+    TQString filename = _url.mid(_url.tqfindRev('/') + 1);
 
     TQValueList<KIO::CopyInfo> files;
     KIO::CopyInfo i;
@@ -1168,7 +1168,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int
     i.uDest   = KURL::fromPathOrURL( _dest );
     i.uDest.addPath( filename );
     files.append(i);
-    if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files );
+    if (!TQFile::exists(i.uDest.prettyURL().tqreplace("file://",TQString()))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files );
     KIO::copy( i.uSource, i.uDest, false ); }
 
 //    m_pIconView->addFuturePosition(filename, x, y);
@@ -1184,7 +1184,7 @@ void KDesktop::removeIcon(const TQString &_url)
 		return;
 	}
 	unlink(KURL(_url).path().latin1());
-	TQString dest = _url.left(_url.findRev('/') + 1);
+	TQString dest = _url.left(_url.tqfindRev('/') + 1);
         m_pIconView->update( dest );
 }
 
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index 19cc4cbbe..be1aeb796 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -41,7 +41,7 @@ class KDIconView;
 class Minicli;
 class KActionCollection;
 
-class KRootWidget : public QObject
+class KRootWidget : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index 27441b170..1d4411ce6 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -123,7 +123,7 @@ static TQString realDesktopPath()
     if (kdesktop_screen_number != 0) {
 	TQString dn = "Desktop";
 	dn += TQString::number(kdesktop_screen_number);
-	desktopPath.replace("Desktop", dn);
+	desktopPath.tqreplace("Desktop", dn);
     }
     return desktopPath;
 }
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index 1d39a093d..00e3ce24c 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -82,7 +82,7 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
 
     // item names may contain ampersands. To avoid them being converted
     // to accelators, replace them with two ampersands.
-    serviceName.replace("&", "&&");
+    serviceName.tqreplace("&", "&&");
 
     TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
                                                                  0, KIcon::DefaultState, 0L, true);
diff --git a/kdesktop/kcustommenu.h b/kdesktop/kcustommenu.h
index 602a09584..93b8d671f 100644
--- a/kdesktop/kcustommenu.h
+++ b/kdesktop/kcustommenu.h
@@ -27,7 +27,7 @@
  * This class provides a Popup Menu with programs that can be executed and
  * that reads its configuration from a config file.
  */
-class KCustomMenu : public QPopupMenu
+class KCustomMenu : public TQPopupMenu
 {
    Q_OBJECT
 public:
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index 4e46a2013..ad166aab4 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -1,13 +1,13 @@
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
 # define DEF2( name, key3, key4, receiver, slot ) \
-   keys->insert( name, i18n(name), TQString::null, key3, key4, receiver, slot );
+   keys->insert( name, i18n(name), TQString(), key3, key4, receiver, slot );
 #else
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString::null, key3, key4 )
+   keys->insert( name, i18n(name), TQString(), key3, key4 )
 # define DEF2( name, key3, key4, receiver, slot ) \
-   keys->insert( name, i18n(name), TQString::null, key3, key4 )
+   keys->insert( name, i18n(name), TQString(), key3, key4 )
 #endif
 #define WIN KKey::QtWIN
 
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 5d20aa12d..076831bba 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -130,7 +130,7 @@ void KDIconView::readIconPosition(KSimpleConfig *config, int &x, int &y)
 // -----------------------------------------------------------------------------
 
 KDIconView::KDIconView( TQWidget *parent, const char* name )
-    : KonqIconViewWidget( parent, name, WResizeNoErase, true ),
+    : KonqIconViewWidget( parent, name, (WFlags)WResizeNoErase, true ),
       m_actionCollection( this, "KDIconView::m_actionCollection" ),
       m_accel( 0L ),
       m_bNeedRepaint( false ),
@@ -296,7 +296,7 @@ void KDIconView::initConfig( bool init )
     m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst();
     m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in
 
-    if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")))
+    if (KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")))
         m_enableMedia=KDesktopSettings::mediaEnabled();
     else
         m_enableMedia=false;
@@ -321,7 +321,7 @@ void KDIconView::initConfig( bool init )
     if ( previewSettings().count() )
     {
         for ( TQStringList::ConstIterator it = oldPreview.begin(); it != oldPreview.end(); ++it)
-            if ( !previewSettings().contains( *it ) ){
+            if ( !previewSettings().tqcontains( *it ) ){
                 kdDebug(1204) << "Disabling preview for " << *it << endl;
                 if ( *it == "audio/" )
                     disableSoundPreviews();
@@ -425,28 +425,28 @@ void KDIconView::createActions()
              undo, TQT_SLOT( setText( const TQString & ) ) );
         undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
 
-        KAction* paCut = KStdAction::cut( this, TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
+        KAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
         KShortcut cutShortCut = paCut->shortcut();
         cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files
         paCut->setShortcut( cutShortCut );
 
-        KStdAction::copy( this, TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
-        KStdAction::paste( this, TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
-        KAction *pasteTo = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
+        KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
+        KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
+        KAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
         pasteTo->setEnabled( false ); // only enabled during popupMenu()
 
         KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
-        new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
+        new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
 
-        (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
-        (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, this, TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
+        (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
+        (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
         KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
         connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
                  this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
 
         KConfig config("kdeglobals", true, false);
         config.setGroup( "KDE" );
-        (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, this, TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+        (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
 
         // Initial state of the actions (cut/copy/paste/...)
         slotSelectionChanged();
@@ -581,7 +581,7 @@ KURL KDIconView::desktopURL()
     if (kdesktop_screen_number != 0) {
         TQString dn = "Desktop";
         dn += TQString::number(kdesktop_screen_number);
-        desktopPath.replace("Desktop", dn);
+        desktopPath.tqreplace("Desktop", dn);
     }
 
     KURL desktopURL;
@@ -605,9 +605,9 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e )
     if (!m_dirLister) return;
     //kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl;
     // TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
-    if ( e->button() == LeftButton && KRootWm::self()->hasLeftButtonMenu() )
+    if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
     {
-        TQIconViewItem *item = findItem( e->pos() );
+        TQIconViewItem *item = tqfindItem( e->pos() );
         if ( !item )
         {
             // Left click menu
@@ -628,7 +628,7 @@ void KDIconView::wheelEvent( TQWheelEvent* e )
     if (!m_dirLister) return;
     //kdDebug(1204) << "KDIconView::wheelEvent" << endl;
 
-    TQIconViewItem *item = findItem( e->pos() );
+    TQIconViewItem *item = tqfindItem( e->pos() );
     if ( !item )
     {
       emit wheelRolled( e->delta() );
@@ -670,7 +670,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _it
 {
     if (!m_dirLister) return;
     //kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl;
-    if ( _item && _button == MidButton )
+    if ( _item && _button == Qt::MidButton )
         slotExecuted(_item);
 }
 
@@ -723,7 +723,7 @@ void KDIconView::slotPopupPasteTo()
 }
 
 // These two functions and the following class are all lifted from desktopbehavior_impl.cpp to handle the media icons
-class DesktopBehaviorMediaItem : public QCheckListItem
+class DesktopBehaviorMediaItem : public TQCheckListItem
 {
 public:
     DesktopBehaviorMediaItem(TQListView *parent, const TQString name, const TQString mimetype, bool on)
@@ -748,7 +748,7 @@ void KDIconView::fillMediaListView()
     for (; it2 != mimetypes.end(); ++it2) {
        if ( ((*it2)->name().startsWith("media/")) )
 	{
-    	    bool ok=excludedMedia.contains((*it2)->name())==0;
+    	    bool ok=excludedMedia.tqcontains((*it2)->name())==0;
 		new DesktopBehaviorMediaItem (mMediaListView, (*it2)->comment(), (*it2)->name(),ok);
         }
     }
@@ -784,7 +784,7 @@ void KDIconView::removeBuiltinIcon(TQString iconName)
 {
     DesktopBehaviorMediaItem *changeItem;
     fillMediaListView();
-    changeItem = static_cast<DesktopBehaviorMediaItem *>(mMediaListView->findItem(iconName, 0));
+    changeItem = static_cast<DesktopBehaviorMediaItem *>(mMediaListView->tqfindItem(iconName, 0));
     if (changeItem != 0) {
         changeItem->setOn(false);
     }
@@ -860,12 +860,12 @@ bool KDIconView::deleteGlobalDesktopFiles()
     return !itemsLeft;
 }
 
-void KDIconView::slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state )
+void KDIconView::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state )
 {
     if (deleteGlobalDesktopFiles())
        return; // All items deleted
 
-    if ( reason == KAction::PopupMenuActivation && ( state & Qt::ShiftButton ) )
+    if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) )
        KonqOperations::del(this, KonqOperations::DEL, selectedUrls());
     else
        KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
@@ -960,20 +960,20 @@ bool KDIconView::isDesktopFile( KFileItem * _item ) const
     return false;
 
   // return true if desktop file
-  return ( (_item->mimetype() == TQString::fromLatin1("application/x-desktop"))
-       || (_item->mimetype() == TQString::fromLatin1("media/builtin-mydocuments"))
-       || (_item->mimetype() == TQString::fromLatin1("media/builtin-mycomputer"))
-       || (_item->mimetype() == TQString::fromLatin1("media/builtin-mynetworkplaces"))
-       || (_item->mimetype() == TQString::fromLatin1("media/builtin-printers"))
-       || (_item->mimetype() == TQString::fromLatin1("media/builtin-trash"))
-       || (_item->mimetype() == TQString::fromLatin1("media/builtin-webbrowser")) );
+  return ( (_item->mimetype() == TQString::tqfromLatin1("application/x-desktop"))
+       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mydocuments"))
+       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mycomputer"))
+       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mynetworkplaces"))
+       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-printers"))
+       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-trash"))
+       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-webbrowser")) );
 }
 
 TQString KDIconView::stripDesktopExtension( const TQString & text )
 {
-    if (text.right(7) == TQString::fromLatin1(".kdelnk"))
+    if (text.right(7) == TQString::tqfromLatin1(".kdelnk"))
       return text.left(text.length() - 7);
-    else if (text.right(8) == TQString::fromLatin1(".desktop"))
+    else if (text.right(8) == TQString::tqfromLatin1(".desktop"))
       return text.left(text.length() - 8);
     return text;
 }
@@ -1009,12 +1009,12 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
         TQStringList tmpList;
         if (cfg.hasKey("OnlyShowIn"))
         {
-            if (!cfg.readListEntry("OnlyShowIn", ';').contains("KDE"))
+            if (!cfg.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
                 return false;
         }
         if (cfg.hasKey("NotShowIn"))
         {
-            if (cfg.readListEntry("NotShowIn", ';').contains("KDE"))
+            if (cfg.readListEntry("NotShowIn", ';').tqcontains("KDE"))
                 return false;
         }
         if (cfg.hasKey("TryExec"))
@@ -1055,7 +1055,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
   KURL desktop_URL = desktopURL();
   if (desktop_URL.isLocalFile())
     desktopPath = desktop_URL.path();
-  // We have new items, so we'll need to repaint in slotCompleted
+  // We have new items, so we'll need to tqrepaint in slotCompleted
   m_bNeedRepaint = true;
   kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() << endl;
   KFileItemListIterator it(entries);
@@ -1198,7 +1198,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries )
     }
     else
     {
-        // In case we replace a big icon with a small one, need to repaint.
+        // In case we replace a big icon with a small one, need to tqrepaint.
         updateContents();
         // Can't do that with m_bNeedRepaint since slotCompleted isn't called
         m_bNeedRepaint = false;
@@ -1305,7 +1305,7 @@ void KDIconView::slotCompleted()
     if (!m_hasExistingPos)
         rearrangeIcons();
 
-//    kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " repaint:" << m_bNeedRepaint << endl;
+//    kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " tqrepaint:" << m_bNeedRepaint << endl;
     if ( m_bNeedSave )
     {
         // Done here because we want to align icons only once initially, and each time new icons appear.
@@ -1317,7 +1317,7 @@ void KDIconView::slotCompleted()
     }
     if ( m_bNeedRepaint )
     {
-        viewport()->repaint();
+        viewport()->tqrepaint();
         m_bNeedRepaint = false;
     }
 }
@@ -1327,7 +1327,7 @@ void KDIconView::slotClipboardDataChanged()
     // This is very related to KonqDirPart::slotClipboardDataChanged
 
     KURL::List lst;
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
         if ( KonqDrag::decodeIsCutSelection( data ) )
             (void) KURLDrag::decode( data, lst );
@@ -1471,7 +1471,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
     bool isImmutable = KGlobal::config()->isImmutable();
 
     if ( (isColorDrag || isImageDrag) && !isUrlDrag ) {
-        // Hack to clear the drag shape
+        // Hack to clear the drag tqshape
         bool bMovable = itemsMovable();
         bool bSignals = signalsBlocked();
         setItemsMovable(false);
@@ -1499,7 +1499,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
     bool adjustedAnyItems = false;
     for( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
     {
-        if( !desk.contains( item->rect(), true ))
+        if( !desk.tqcontains( item->rect(), true ))
         {
             TQRect r = item->rect();
 
@@ -1519,7 +1519,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
     if( adjustedAnyItems )
     {
         // Make sure the viewport isn't unnecessarily resized by now,
-        // then schedule a repaint to remove any garbage pixels.
+        // then schedule a tqrepaint to remove any garbage pixels.
         resizeContents( width(), height() );
         viewport()->update();
     }
@@ -1541,7 +1541,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 {
     m_gotIconsArea = true;  // now we have it!
 
-    if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return;  // nothing changed; avoid repaint/saveIconPosition ...
+    if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return;  // nothing changed; avoid tqrepaint/saveIconPosition ...
 
     TQRect oldArea = iconArea();
     setIconArea( wr );
@@ -1593,8 +1593,8 @@ void KDIconView::updateWorkArea( const TQRect &wr )
             }
         }
         if ( needRepaint ) {
-            viewport()->repaint( FALSE );
-            repaint( FALSE );
+            viewport()->tqrepaint( FALSE );
+            tqrepaint( FALSE );
             saveIconPositions();
         }
     }
@@ -1615,7 +1615,7 @@ void KDIconView::setupSortKeys()
         if (!m_itemsAlwaysFirst.isEmpty())
         {
             TQString strFileName = static_cast<KFileIVI *>( it )->item()->url().fileName();
-            int nFind = m_itemsAlwaysFirst.findIndex(strFileName);
+            int nFind = m_itemsAlwaysFirst.tqfindIndex(strFileName);
             if (nFind >= 0)
                 strKey = "0" + TQString::number(nFind);
         }
@@ -1718,7 +1718,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item )
     TQRect rect=item->rect();
     if (m_bVertAlign)
     {
-	kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl;
+	kdDebug(1214)<<"moveToFreePosition for vertical tqalignment"<<endl;
 
 	rect.moveTopLeft(TQPoint(spacing(),spacing()));
       do
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 6afde0e4b..34028d84c 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -138,7 +138,7 @@ protected slots:
     // slots connected to the popupmenu (actions)
     void slotCut();
     void slotCopy();
-    void slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state );
+    void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state );
     void slotDelete();
     void slotPopupPasteTo();
     void slotProperties();
diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp
index d5e367bc0..7d0f201ab 100644
--- a/kdesktop/kfileividesktop.cpp
+++ b/kdesktop/kfileividesktop.cpp
@@ -73,15 +73,15 @@ void KFileIVIDesktop::calcRect( const TQString& _text )
 
     int spread = shadowThickness();
     TQRect itemTextRect = textRect();
-    TQRect itemRect = rect();
+    TQRect tqitemRect = rect();
 
     itemTextRect.setBottom( itemTextRect.bottom() + spread );
     itemTextRect.setRight( itemTextRect.right() + spread );
-    itemRect.setBottom( itemRect.bottom() + spread );
-    itemRect.setRight( itemRect.right() + spread );
+    tqitemRect.setBottom( tqitemRect.bottom() + spread );
+    tqitemRect.setRight( tqitemRect.right() + spread );
 
     setTextRect( itemTextRect );
-    setItemRect( itemRect );
+    setItemRect( tqitemRect );
 }
 
 void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)
@@ -191,7 +191,7 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
     else {
       text = settings->textColor();
       shadow = ( settings->bgColor().isValid() ) ? settings->bgColor() :
-               ( qGray( text.rgb() ) > 127 ) ? black : white;
+               ( tqGray( text.rgb() ) > 127 ) ? black : white;
       if (rebuild) {
         setNormalImage(buildShadow(p, align, shadow));
         _normalUID = uid;
diff --git a/kdesktop/kfileividesktop.h b/kdesktop/kfileividesktop.h
index 129abec07..6ceed0b42 100644
--- a/kdesktop/kfileividesktop.h
+++ b/kdesktop/kfileividesktop.h
@@ -91,7 +91,7 @@ class KFileIVIDesktop : public KFileIVI
      * Builds the shadow. As the algorithm is pretty slow (at pixel level),
      * This method is triggered only if the configuration has changed.
      * @param p the painter for drawing the item
-     * @param align the shadow alignment
+     * @param align the shadow tqalignment
      * @param shadowColor the shadow color
      */
     virtual TQImage *buildShadow(TQPainter *p, const int align, TQColor &shadowColor);
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index e44c027c2..2ea6fa87c 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -131,7 +131,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop)
 
   if (kapp->authorize("run_command"))
   {
-     new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+     new KAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
      new KAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
 	m_actionCollection, "open_terminal" );
   }
@@ -243,7 +243,7 @@ void KRootWm::initConfig()
     if (s == s_choices[c])
       { rightButtonChoice = (menuChoice) c; break; }
 
-  // Read configuration for icons alignment
+  // Read configuration for icons tqalignment
   if ( m_bDesktopEnabled ) {
     bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); 
     if ( kapp->authorize( "editable_desktop_icons" ) ) {
@@ -606,15 +606,15 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
 {
     if (!desktopMenu) return; // initialisation not yet done
     switch ( _button ) {
-    case LeftButton:
+    case Qt::LeftButton:
         if ( m_bShowMenuBar && menuBar )
             menuBar->raise();
         activateMenu( leftButtonChoice, _global );
         break;
-    case MidButton:
+    case Qt::MidButton:
         activateMenu( middleButtonChoice, _global );
         break;
-    case RightButton:
+    case Qt::RightButton:
         if (!kapp->authorize("action/kdesktop_rmb")) return;
         activateMenu( rightButtonChoice, _global );
         break;
@@ -636,8 +636,8 @@ void KRootWm::slotWindowList() {
   windowListMenu->init();
   disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
            this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
-  // windowListMenu->rect() is not valid before showing, use sizeHint()
-  windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center());
+  // windowListMenu->rect() is not valid before showing, use tqsizeHint()
+  windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->tqsizeHint()).center());
   windowListMenu->selectActiveWindow(); // make the popup more useful
   connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
            this, TQT_SLOT( slotWindowListAboutToShow() ) );
@@ -656,7 +656,7 @@ void KRootWm::slotSwitchUser() {
   slotPopulateSessions();
   disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
            this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
-  sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
+  sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->tqsizeHint()).center());
   connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
            TQT_SLOT( slotPopulateSessions() ) );
 }
@@ -810,17 +810,17 @@ void KRootWm::slotToggleDesktopMenu()
 
 void KRootWm::slotUnclutterWindows()
 {
-    kapp->dcopClient()->send(kwin_name, "KWinInterface", "unclutterDesktop()", "");
+    kapp->dcopClient()->send(kwin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
 }
 
 
 void KRootWm::slotCascadeWindows() {
-    kapp->dcopClient()->send(kwin_name, "KWinInterface", "cascadeDesktop()", "");
+    kapp->dcopClient()->send(kwin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
 }
 
 
 void KRootWm::slotLock() {
-    kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "lock()", "");
+    kapp->dcopClient()->send(kdesktop_name, "KScreensaverIface", "lock()", TQString(""));
 }
 
 
diff --git a/kdesktop/kshadowengine.cpp b/kdesktop/kshadowengine.cpp
index 893eac8e0..e8493b92b 100644
--- a/kdesktop/kshadowengine.cpp
+++ b/kdesktop/kshadowengine.cpp
@@ -110,7 +110,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC
       alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow;
 
       // update the shadow's i,j pixel.
-      result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
+      result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
     }
   }
   return result;
@@ -127,15 +127,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j)
     return 0;
 
   double alphaShadow;
-  alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
-		qGray(source.pixel(i-1,j  )) * AXIS_FACTOR +
-		qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
-		qGray(source.pixel(i  ,j-1)) * AXIS_FACTOR +
+  alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
+		tqGray(source.pixel(i-1,j  )) * AXIS_FACTOR +
+		tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
+		tqGray(source.pixel(i  ,j-1)) * AXIS_FACTOR +
 		0                         +
-		qGray(source.pixel(i  ,j+1)) * AXIS_FACTOR +
-		qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
-		qGray(source.pixel(i+1,j  )) * AXIS_FACTOR +
-		qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
+		tqGray(source.pixel(i  ,j+1)) * AXIS_FACTOR +
+		tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
+		tqGray(source.pixel(i+1,j  )) * AXIS_FACTOR +
+		tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
 
   return alphaShadow;
 }
@@ -185,7 +185,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j)
 	else
 	  sy = j + m;
 
-	opacity += qGray(source.pixel(sx, sy));
+	opacity += tqGray(source.pixel(sx, sy));
       }
     }
     alphaShadow += opacity / m_shadowSettings->multiplicationFactor();
diff --git a/kdesktop/kshadowengine.h b/kdesktop/kshadowengine.h
index 33391e464..4a9d6b7eb 100644
--- a/kdesktop/kshadowengine.h
+++ b/kdesktop/kshadowengine.h
@@ -92,13 +92,13 @@ class KShadowEngine
 
 		/*
 		 * a slower algorithm where the influence of a pixel
-		 * is  qGray(px)/(abs(dx) + abs(dy) +1).
+		 * is  tqGray(px)/(abs(dx) + abs(dy) +1).
 		 */
 		double doubleLinearDecay(TQImage& source, int x, int y);
 
 		/*
 		 * a very slow algorithm where the influence of a pixel
-		 * is  qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
+		 * is  tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
 		 */
 		double radialDecay(TQImage& source, int x, int y);
 
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index e0e6ab322..b3560c793 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -171,7 +171,7 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
     } else {
         // Try to find an appropriate viewer component
         m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>
-                 ( mimeType, TQString::null, 0, 0, this, 0 );
+                 ( mimeType, TQString(), 0, 0, this, 0 );
         if ( !m_part )
             kdWarning() << "No handler found for " << mimeType << endl;
         else {
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index 7ec81338e..b4b5cc0fc 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -26,7 +26,7 @@
 
 namespace KIO { class Job; }
 
-class KWebDesktop : public QObject
+class KWebDesktop : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index ff173c842..97dd253a7 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -52,9 +52,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents)
 	while (!line.isNull())
 	{
 		if (line.startsWith("XDG_DESKTOP_DIR="))
-			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+			*desktop = TQString(line.remove("XDG_DESKTOP_DIR=").remove("\"")).tqreplace("$HOME", TQDir::homeDirPath());
 		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
-			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+			*documents = TQString(line.remove("XDG_DOCUMENTS_DIR=").remove("\"")).tqreplace("$HOME", TQDir::homeDirPath());
 
 		line = s.readLine();
 	}
@@ -132,7 +132,7 @@ int main( int argc, char **argv)
 						}
 						if (directoryOk == true) {
 							TQString xdgModifiedDirectory = newDirectory;
-							xdgModifiedDirectory = xdgModifiedDirectory.replace(TQDir::homeDirPath(), "$HOME");
+							xdgModifiedDirectory = xdgModifiedDirectory.tqreplace(TQDir::homeDirPath(), "$HOME");
 							while (xdgModifiedDirectory.endsWith("/")) {
 								xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1);
 							}
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index b51791d98..3dbb3ac6b 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -27,7 +27,7 @@
 
 #define COUNTDOWN 30 
 
-AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog", true, WX11BypassWM)
+AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog", true, (WFlags)WX11BypassWM)
 {
     frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
@@ -40,7 +40,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
     TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame);
 
     mStatusLabel = new TQLabel("<b> </b>", frame);
-    mStatusLabel->setAlignment(TQLabel::AlignCenter);
+    mStatusLabel->tqsetAlignment(TQLabel::AlignCenter);
 
     TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame);
     mProgressRemaining = new TQProgressBar(frame);
@@ -66,7 +66,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
 
     mCountdownTimerId = startTimer(1000/25);
 
-    connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
+    connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
 }
 
 AutoLogout::~AutoLogout()
@@ -102,7 +102,7 @@ void AutoLogout::slotActivity()
 
 void AutoLogout::logout()
 {
-	killTimers();
+	TQT_TQOBJECT(this)->killTimers();
 	DCOPRef("ksmserver","ksmserver").send("logout", 0, 0, 0);
 }
 
diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h
index f40ac5f0d..c15a47f07 100644
--- a/kdesktop/lock/autologout.h
+++ b/kdesktop/lock/autologout.h
@@ -20,7 +20,7 @@ class TQLabel;
 class TQDialog;
 class TQProgressBar;
 
-class AutoLogout : public QDialog
+class AutoLogout : public TQDialog
 {
     Q_OBJECT
 
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index 2249dc46e..60c500925 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -59,7 +59,7 @@
 // Simple dialog for displaying an unlock status or recurring error message
 //
 InfoDlg::InfoDlg(LockProcess *parent)
-    : TQDialog(parent, "information dialog", true, WX11BypassWM),
+    : TQDialog(parent, "information dialog", true, (WFlags)WX11BypassWM),
       mUnlockingFailed(false)
 {
     frame = new TQFrame( this );
@@ -72,7 +72,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
     KUser user;
 
     mStatusLabel = new TQLabel( "<b> </b>", frame );
-    mStatusLabel->setAlignment( TQLabel::AlignCenter );
+    mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
 
     TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
     unlockDialogLayout->addWidget( frame );
@@ -81,7 +81,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
     layStatus->addWidget( mStatusLabel );
 
     frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-    frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
+    frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
     frameLayout->addLayout( layStatus, 1, 1 );
 
     installEventFilter(this);
diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h
index a0ca3b8c0..bb974282f 100644
--- a/kdesktop/lock/infodlg.h
+++ b/kdesktop/lock/infodlg.h
@@ -24,7 +24,7 @@ class TQListView;
 // Simple dialog for displaying an info message.
 // It does not handle password validation.
 //
-class InfoDlg : public QDialog
+class InfoDlg : public TQDialog
 {
     Q_OBJECT
 
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 2efe56a8a..60c382511 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -65,7 +65,7 @@
 // Simple dialog for entering a password.
 //
 PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
-    : TQDialog(parent, "password dialog", true, WX11BypassWM),
+    : TQDialog(parent, "password dialog", true, (WFlags)WX11BypassWM),
       mPlugin( plugin ),
       mCapsLocked(-1),
       mUnlockingFailed(false)
@@ -83,7 +83,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
             i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame );
 
     mStatusLabel = new TQLabel( "<b> </b>", frame );
-    mStatusLabel->setAlignment( TQLabel::AlignCenter );
+    mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
 
     mLayoutButton = new TQPushButton( frame );
     mLayoutButton->setFlat( true );
@@ -112,7 +112,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
     layButtons->addWidget( cancel );
 
     frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-    frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, AlignTop );
+    frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop );
     frameLayout->addWidget( greetLabel, 0, 1 );
     frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
     frameLayout->addLayout( layStatus, 2, 1 );
@@ -135,7 +135,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
 
     mFailedTimerId = 0;
     mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
-    connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+    connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
 
     greet->start();
 
@@ -144,7 +144,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
         layoutsList = kxkb.call("getLayoutsList");
         TQString currentLayout = kxkb.call("getCurrentLayout");
         if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
-            currLayout = layoutsList.find(currentLayout);
+            currLayout = layoutsList.tqfind(currentLayout);
             if (currLayout == layoutsList.end())
                 setLayoutText("err");
             else
@@ -179,7 +179,7 @@ void PasswordDlg::setLayoutText( const TQString &txt )
 {
     mLayoutButton->setText( txt );
     TQSize sz = mLayoutButton->fontMetrics().size( 0, txt );
-    int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+    int mrg = mLayoutButton->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
     mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg );
 }
 
@@ -468,7 +468,7 @@ void PasswordDlg::gplugActivity()
 
 void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
 {
-    TQDialog dialog( this, 0, true, WX11BypassWM );
+    TQDialog dialog( this, 0, true, (WFlags)WX11BypassWM );
     TQFrame *winFrame = new TQFrame( &dialog );
     winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
     winFrame->setLineWidth( 2 );
@@ -480,7 +480,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
     TQLabel *label2 = new TQLabel( text, winFrame );
     KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
     button->setDefault( true );
-    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
 
     TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
@@ -513,7 +513,7 @@ void PasswordDlg::slotStartNewSession()
     killTimer(mTimeoutTimerId);
     mTimeoutTimerId = 0;
 
-    TQDialog *dialog = new TQDialog( this, "warnbox", true, WX11BypassWM );
+    TQDialog *dialog = new TQDialog( this, "warnbox", true, (WFlags)WX11BypassWM );
     TQFrame *winFrame = new TQFrame( dialog );
     winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
     winFrame->setLineWidth( 2 );
@@ -627,7 +627,7 @@ void PasswordDlg::slotSwitchUser()
     int p = 0;
     DM dm;
 
-    TQDialog dialog( this, "sessbox", true, WX11BypassWM );
+    TQDialog dialog( this, "sessbox", true, (WFlags)WX11BypassWM );
     TQFrame *winFrame = new TQFrame( &dialog );
     winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
     winFrame->setLineWidth( 2 );
@@ -667,9 +667,9 @@ void PasswordDlg::slotSwitchUser()
             ns++;
         }
         int fw = lv->frameWidth() * 2;
-        TQSize hds( lv->header()->sizeHint() );
+        TQSize hds( lv->header()->tqsizeHint() );
         lv->setMinimumWidth( fw + hds.width() +
-            (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
+            (ns > 10 ? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
         lv->setFixedHeight( fw + hds.height() +
             itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
         lv->header()->adjustHeaderSize();
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index cdd5581e7..69c121002 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -195,7 +195,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
 
     TQStringList dmopt =
         TQStringList::split(TQChar(','),
-                            TQString::fromLatin1( ::getenv( "XDM_MANAGED" )));
+                            TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" )));
     for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
         if ((*it).startsWith("method="))
             mMethod = (*it).mid(7);
@@ -421,7 +421,7 @@ void LockProcess::setupSignals()
 
     pipe(signal_pipe);
     TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0],
-	TQSocketNotifier::Read, this );
+	TQSocketNotifier::Read, TQT_TQOBJECT(this) );
     connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal()));
 }
 
@@ -550,7 +550,7 @@ void LockProcess::readSaver()
 	bool opengl = kapp->authorize("opengl_screensavers");
 	bool manipulatescreen = kapp->authorize("manipulatescreen_screensavers");
         KDesktopFile config(file, true);
-	if (config.readEntry("X-KDE-Type").utf8())
+	if (config.readEntry("X-KDE-Type").utf8() != 0)
 	{
 		TQString saverType = config.readEntry("X-KDE-Type").utf8();
 		TQStringList saverTypes = TQStringList::split(";", saverType);
@@ -660,7 +660,7 @@ void LockProcess::createSaverWindow()
     // screen state if necessary
     setBackgroundMode(TQWidget::NoBackground);
 
-    setCursor( blankCursor );
+    setCursor( tqblankCursor );
     setGeometry(0, 0, mRootWidth, mRootHeight);
 
     kdDebug(1204) << "Saver window Id: " << winId() << endl;
@@ -670,7 +670,7 @@ void LockProcess::desktopResized()
 {
     mBusy = true;
     suspend();
-    setCursor( blankCursor );
+    setCursor( tqblankCursor );
 
     // Get root window size
     XWindowAttributes rootAttr;
@@ -840,7 +840,7 @@ bool LockProcess::grabMouse()
 {
     int rv = XGrabPointer( qt_xdisplay(), TQApplication::desktop()->winId(),
             True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
-            blankCursor.handle(), CurrentTime );
+            TQCursor(tqblankCursor).handle(), CurrentTime );
 
     return (rv == GrabSuccess);
 }
@@ -904,13 +904,13 @@ bool LockProcess::startSaver()
     saveVRoot();
 
     if (mParent) {
-        TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier");
+        TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, TQT_TQOBJECT(this), "notifier");
         connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver()));
     }
     createSaverWindow();
     move(0, 0);
     show();
-    setCursor( blankCursor );
+    setCursor( tqblankCursor );
 
     raise();
     XSync(qt_xdisplay(), False);
@@ -944,7 +944,7 @@ void LockProcess::stopSaver()
 TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt)
 {
     LockProcess *that = (LockProcess *)ctx;
-    TQString fkey = TQString::fromLatin1( key ) + '=';
+    TQString fkey = TQString::tqfromLatin1( key ) + '=';
     for (TQStringList::ConstIterator it = that->mPluginOptions.begin();
          it != that->mPluginOptions.end(); ++it)
         if ((*it).startsWith( fkey ))
@@ -1182,7 +1182,7 @@ int LockProcess::execDialog( TQDialog *dlg )
     {
         suspend();
         XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS,
-                arrowCursor.handle(), CurrentTime);
+                TQCursor(tqarrowCursor).handle(), CurrentTime);
     }
     mDialogs.prepend( dlg );
     fakeFocusIn( dlg->winId());
@@ -1192,7 +1192,7 @@ int LockProcess::execDialog( TQDialog *dlg )
     mDialogs.remove( dlg );
     if( mDialogs.isEmpty() ) {
         XChangeActivePointerGrab( qt_xdisplay(), GRABEVENTS,
-                blankCursor.handle(), CurrentTime);
+                TQCursor(tqblankCursor).handle(), CurrentTime);
         resume( false );
     } else
         fakeFocusIn( mDialogs.first()->winId());
@@ -1226,7 +1226,7 @@ void LockProcess::doFunctionKeyBroadcast() {
         }
         mDialogControlLock = false;
     }
-    setCursor( blankCursor );
+    setCursor( tqblankCursor );
 
     DCOPRef ref( "*", "MainApplication-Interface");
     ref.send("sendFakeKey", DCOPArg(mkeyCode , "unsigned int"));
@@ -1341,7 +1341,7 @@ bool LockProcess::x11Event(XEvent *event)
     {
         XEvent ev2 = *event;
         ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId();
-        qApp->x11ProcessEvent( &ev2 );
+        tqApp->x11ProcessEvent( &ev2 );
         return true;
     }
 
@@ -1444,7 +1444,7 @@ void LockProcess::unlockXF86()
 
 void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
 {
-    TQDialog box( 0, "messagebox", true, WX11BypassWM );
+    TQDialog box( 0, "messagebox", true, (WFlags)WX11BypassWM );
     TQFrame *winFrame = new TQFrame( &box );
     winFrame->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
     winFrame->setLineWidth( 2 );
@@ -1453,7 +1453,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
     TQLabel *label2 = new TQLabel( txt, winFrame );
     KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
     button->setDefault( true );
-    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
 
     TQVBoxLayout *vbox = new TQVBoxLayout( &box );
@@ -1525,7 +1525,7 @@ void LockProcess::windowAdded( WId w, bool managed )
                                         &length, &after, &data );
             bool withdrawn = true;
             if ( r == Success && data && format == 32 ) {
-                Q_UINT32 *wstate = (Q_UINT32*)data;
+                TQ_UINT32 *wstate = (TQ_UINT32*)data;
                 withdrawn  = (*wstate == WithdrawnState );
                 XFree( (char *)data );
             }
@@ -1576,7 +1576,7 @@ bool LockProcess::forwardVkbdEvent( XEvent* event )
     for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin();
          it != mVkbdWindows.end();
          ++it ) {
-        if( (*it).rect.contains( pos )) {
+        if( TQT_TQRECT_OBJECT((*it).rect).tqcontains( pos )) {
             // Find the subwindow where the event should actually go.
             // Not exactly cheap in the number of X roundtrips but oh well.
             Window window = (*it).id;
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 76ffb6013..9f9c2c0bf 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -41,7 +41,7 @@ struct GreeterPluginHandle {
 // starting screensaver hacks, and password entry.
 //
 class LockProcess
-    : public QWidget
+    : public TQWidget
 {
     Q_OBJECT
 public:
@@ -153,7 +153,7 @@ private:
         WId id;
         QRect rect;
         };
-    QValueList< VkbdWindow > mVkbdWindows;
+    TQValueList< VkbdWindow > mVkbdWindows;
     WId         mVkbdLastEventWindow;
 
     bool        mPipeOpen;
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 6e032bebb..3f6bdb330 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -96,7 +96,7 @@ int main( int argc, char **argv )
         kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
         dpy = 0;
 
-        if ((pos = display_name.findRev('.')) != -1)
+        if ((pos = display_name.tqfindRev('.')) != -1)
             display_name.remove(pos, 10);
 
         TQCString env;
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index d4ad06e88..b05d77076 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -59,7 +59,7 @@
 // Simple dialog for displaying a password/PIN entry dialog
 //
 QueryDlg::QueryDlg(LockProcess *parent)
-    : TQDialog(parent, "query dialog", true, WX11BypassWM),
+    : TQDialog(parent, "query dialog", true, (WFlags)WX11BypassWM),
       mUnlockingFailed(false)
 {
     frame = new TQFrame( this );
@@ -72,8 +72,8 @@ QueryDlg::QueryDlg(LockProcess *parent)
     KUser user;
 
     mStatusLabel = new TQLabel( "<b> </b>", frame );
-    //mStatusLabel->setAlignment( TQLabel::AlignCenter );
-    mStatusLabel->setAlignment( TQLabel::AlignLeft );
+    //mStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
+    mStatusLabel->tqsetAlignment( TQLabel::AlignLeft );
 
     KSeparator *sep = new KSeparator( KSeparator::HLine, frame );
 
@@ -95,7 +95,7 @@ QueryDlg::QueryDlg(LockProcess *parent)
     layButtons->addWidget( ok );
 
     frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-    frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
+    frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
     frameLayout->addLayout( layStatus, 0, 1 );
     frameLayout->addLayout( layPin, 2, 1 );
     frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h
index e6a768369..0da557caf 100644
--- a/kdesktop/lock/querydlg.h
+++ b/kdesktop/lock/querydlg.h
@@ -26,7 +26,7 @@ class TQListView;
 // Simple dialog for displaying an query dialog.
 // It does not handle password validation.
 //
-class QueryDlg : public QDialog
+class QueryDlg : public TQDialog
 {
     Q_OBJECT
 
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 695392165..d9eaa5f91 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -129,7 +129,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 	    XCloseDisplay(dpy);
 	    dpy = 0;
 
-	    if ((pos = display_name.findRev('.')) != -1)
+	    if ((pos = display_name.tqfindRev('.')) != -1)
 		display_name.remove(pos, 10);
 
             TQCString env;
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 027aa0bfc..cb7ebbdab 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -76,7 +76,7 @@
 #define KDESU_ERR strerror(errno)
 
 Minicli::Minicli( TQWidget *parent, const char *name)
-        :KDialog( parent, name, false, WType_TopLevel ),
+        :KDialog( parent, name, false, (WFlags)WType_TopLevel ),
          m_autoCheckedRunInTerm(false)
 {
   m_pURLCompletion = 0L;
@@ -89,7 +89,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
   mainLayout->addWidget(m_dlg);
 
   m_dlg->lbRunIcon->setPixmap(DesktopIcon("kmenu"));
-  m_dlg->lbComment->setAlignment( Qt::WordBreak );
+  m_dlg->lbComment->tqsetAlignment( TQt::WordBreak );
 
   m_dlg->cbCommand->setDuplicatesEnabled( false );
   m_dlg->cbCommand->setTrapReturnKey( true );
@@ -173,15 +173,15 @@ void Minicli::setCommand(const TQString& command)
 {
   m_dlg->cbCommand->lineEdit()->setText(command);
   m_dlg->cbCommand->lineEdit()->deselect();
-  int firstSpace = command.find(' ');
+  int firstSpace = command.tqfind(' ');
   if (firstSpace > 0) {
     m_dlg->cbCommand->lineEdit()->setSelection(firstSpace+1, command.length());
   }
 }
 
-TQSize Minicli::sizeHint() const
+TQSize Minicli::tqsizeHint() const
 {
-  int maxWidth = qApp->desktop()->screenGeometry((TQWidget*)this).width();
+  int maxWidth = tqApp->desktop()->screenGeometry((TQWidget*)this).width();
   if (maxWidth < 603)
   {
     // a sensible max for smaller screens
@@ -319,7 +319,7 @@ void Minicli::accept()
      int kicker_screen_number = qt_xscreen();
      if ( kicker_screen_number )
          appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-     kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", "");
+     kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
   }
 }
 
@@ -389,7 +389,7 @@ TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args)
   else
     terminal += TQString(" -e /bin/sh -c \"%1 %2\"").arg(cmd).arg(args);
 
-  if (!m_terminalAppList.contains(cmd))
+  if (!m_terminalAppList.tqcontains(cmd))
     m_terminalAppList << cmd;
 
   return terminal;
@@ -414,13 +414,13 @@ int Minicli::runCommand()
     cmd = uri.url();
     
   TQCString asn;
-  if( qApp->desktop()->isVirtualDesktop())
+  if( tqApp->desktop()->isVirtualDesktop())
   {
     asn = KStartupInfo::createNewStartupId();
     KStartupInfoId id;
     id.initId( asn );
     KStartupInfoData data;
-    data.setXinerama( qApp->desktop()->screenNumber( this ));
+    data.setXinerama( tqApp->desktop()->screenNumber( this ));
     KStartupInfo::sendChange( id, data );
   }
 
@@ -558,7 +558,7 @@ int Minicli::runCommand()
         case KURIFilterData::HELP:
         {
           // No need for kfmclient, KRun does it all (David)
-          (void) new KRun( m_filterData->uri(), parentWidget(), asn );
+          (void) new KRun( m_filterData->uri(), tqparentWidget(), asn );
           return 0;
         }
         case KURIFilterData::EXECUTABLE:
@@ -570,7 +570,7 @@ int Minicli::runCommand()
             if (service && service->isValid() && service->type() == "Application")
             {
               notifyServiceStarted(service);
-              KRun::run(*service, KURL::List(), parentWidget(), asn );
+              KRun::run(*service, KURL::List(), tqparentWidget(), asn );
               return 0;
             }
           }
@@ -605,7 +605,7 @@ int Minicli::runCommand()
           if (service && service->isValid() && service->type() == "Application")
           {
             notifyServiceStarted(service);
-            KRun::run(*service, KURL::List(), parentWidget(), asn );
+            KRun::run(*service, KURL::List(), tqparentWidget(), asn );
             return 0;
           }
 
@@ -613,7 +613,7 @@ int Minicli::runCommand()
           if (service && service->isValid() && service->type() == "Application")
           {
             notifyServiceStarted(service);
-            KRun::run(*service, KURL::List(), parentWidget(), asn );
+            KRun::run(*service, KURL::List(), tqparentWidget(), asn );
             return 0;
           }
 
@@ -625,7 +625,7 @@ int Minicli::runCommand()
       }
     }
 
-    if ( KRun::runCommand( cmd, exec, m_iconName, parentWidget(), asn ) )
+    if ( KRun::runCommand( cmd, exec, m_iconName, tqparentWidget(), asn ) )
       return 0;
     else
     {
@@ -674,7 +674,7 @@ void Minicli::slotCmdChanged(const TQString& text)
     // Also use autocompletion if it appears that I am using some kind of ioslave, except the http:// ioslave
     m_urlCompletionStarted = true; // flag for slotMatch()
 
-    if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.contains("://", false) != 0)) && (text.contains("http://", false) == 0)) {
+    if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.tqcontains("://", false) != 0)) && (text.tqcontains("http://", false) == 0)) {
         TQString completion = m_pURLCompletion->makeCompletion( text );
     }
   }
@@ -730,7 +730,7 @@ void Minicli::slotAdvanced()
 
     // Set the focus back to the widget that had it to begin with, i.e.
     // do not put the focus on the "Options" button.
-    m_FocusWidget = focusWidget();
+    m_FocusWidget = tqfocusWidget();
 
     if( m_FocusWidget )
       m_FocusWidget->setFocus();
@@ -763,7 +763,7 @@ void Minicli::parseLine( bool final )
     KURIFilter::self()->filterURI( *(m_filterData), m_middleFilters );
 
   bool isTerminalApp = ((m_filterData->uriType() == KURIFilterData::EXECUTABLE) &&
-                        m_terminalAppList.contains(m_filterData->uri().url()));
+                        m_terminalAppList.tqcontains(m_filterData->uri().url()));
 
   if( !isTerminalApp )
   {
@@ -792,7 +792,7 @@ void Minicli::parseLine( bool final )
 void Minicli::setIcon ()
 {
   if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" )
-    m_iconName = TQString::fromLatin1("kmenu");
+    m_iconName = TQString::tqfromLatin1("kmenu");
 
   TQPixmap icon = DesktopIcon( m_iconName );
 
@@ -806,13 +806,13 @@ void Minicli::setIcon ()
     {
       int x = icon.width() - overlay.width();
       int y = icon.height() - overlay.height();
-      if ( icon.mask() )
+      if ( icon.tqmask() )
       {
-        TQBitmap mask = *icon.mask();
+        TQBitmap mask = *icon.tqmask();
         bitBlt( &mask, x, y,
-                overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay,
+                overlay.tqmask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(overlay.tqmask())) : &overlay,
                 0, 0, overlay.width(), overlay.height(),
-                overlay.mask() ? OrROP : SetROP );
+                overlay.tqmask() ? OrROP : SetROP );
         icon.setMask(mask);
       }
       bitBlt( &icon, x, y, &overlay );
@@ -837,9 +837,9 @@ void Minicli::updateAuthLabel()
       m_prevChecked = m_dlg->cbRunAsOther->isChecked();
       m_prevCached = true;
     }
-    if (m_dlg->leUsername->text() != TQString::fromLatin1("root"))
+    if (m_dlg->leUsername->text() != TQString::tqfromLatin1("root"))
       m_dlg->lePassword->setText(TQString::null);
-    m_dlg->leUsername->setText(TQString::fromLatin1("root"));
+    m_dlg->leUsername->setText(TQString::tqfromLatin1("root"));
     m_dlg->cbRunAsOther->setChecked(true);
     m_dlg->cbRunAsOther->setEnabled(false);
     m_dlg->leUsername->setEnabled(false);
@@ -884,7 +884,7 @@ void Minicli::slotTerminal(bool enable)
   if (enable)
   {
     m_prevIconName = m_iconName;
-    m_iconName = TQString::fromLatin1( "konsole" );
+    m_iconName = TQString::tqfromLatin1( "konsole" );
     setIcon();
   }
   else if (!m_prevIconName.isEmpty())
diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h
index 4ae49cf7c..93c296600 100644
--- a/kdesktop/minicli.h
+++ b/kdesktop/minicli.h
@@ -57,7 +57,7 @@ public:
   void clearHistory();
   
   virtual void show();
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
 
 public slots:
   void saveConfig();
diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui
index 3809eb852..52e5a3d49 100644
--- a/kdesktop/minicli_ui.ui
+++ b/kdesktop/minicli_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MinicliDlgUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MinicliDlgUI</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="resizeMode">
             <enum>FreeResize</enum>
         </property>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout4</cstring>
             </property>
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
@@ -105,7 +105,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>layout4</cstring>
             </property>
@@ -123,14 +123,14 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>57</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>gbAdvanced</cstring>
                     </property>
@@ -157,14 +157,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>30</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="4">
+                        <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="4">
                             <property name="name">
                                 <cstring>cbRealtime</cstring>
                             </property>
@@ -180,7 +180,7 @@
 &lt;/qt&gt;</string>
                             </property>
                         </widget>
-			<widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="4">
+			<widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="4">
 				<property name="name">
 					<cstring>cbAutocomplete</cstring>
 				</property>
@@ -192,7 +192,7 @@
 						&lt;/qt&gt;</string>
 				</property>
                         </widget>
-			<widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="4">
+			<widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="4">
 				<property name="name">
 					<cstring>cbAutohistory</cstring>
 				</property>
@@ -204,7 +204,7 @@
 						&lt;/qt&gt;</string>
 				</property>
                         </widget>
-                        <widget class="QLabel" row="3" column="1">
+                        <widget class="TQLabel" row="3" column="1">
                             <property name="name">
                                 <cstring>lbUsername</cstring>
                             </property>
@@ -248,7 +248,7 @@
                                 <string>Enter the password here for the user you specified above.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="1">
+                        <widget class="TQLabel" row="4" column="1">
                             <property name="name">
                                 <cstring>lbPassword</cstring>
                             </property>
@@ -273,7 +273,7 @@
                                 <string>Enter the password here for the user you specified above.</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4">
+                        <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4">
                             <property name="name">
                                 <cstring>cbRunInTerminal</cstring>
                             </property>
@@ -284,7 +284,7 @@
                                 <string>Check this option if the application you want to run is a text mode application. The application will then be run in a terminal emulator window.</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="6" column="1">
+                        <widget class="TQLayoutWidget" row="6" column="1">
                             <property name="name">
                                 <cstring>layout30</cstring>
                             </property>
@@ -292,7 +292,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -319,7 +319,7 @@
                                     <property name="sizeType">
                                         <enum>Minimum</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>9</height>
@@ -328,7 +328,7 @@
                                 </spacer>
                             </vbox>
                         </widget>
-                        <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="4">
+                        <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="4">
                             <property name="name">
                                 <cstring>cbPriority</cstring>
                             </property>
@@ -358,7 +358,7 @@
                                 <string>Enter the user you want to run the application as here.</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="6" column="2" rowspan="1" colspan="2">
+                        <widget class="TQLayoutWidget" row="6" column="2" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>layout29</cstring>
                             </property>
@@ -369,7 +369,7 @@
                                 <property name="spacing">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel" row="1" column="0">
+                                <widget class="TQLabel" row="1" column="0">
                                     <property name="name">
                                         <cstring>lbLowPriority</cstring>
                                     </property>
@@ -383,7 +383,7 @@
                                         <string>The priority that the command will be run with can be set here. From left to right, it goes from low to high. The center position is the default value. For priorities higher than the default, you will need to provide the root password.</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="1" column="1">
+                                <widget class="TQLabel" row="1" column="1">
                                     <property name="name">
                                         <cstring>lbHighPriority</cstring>
                                     </property>
@@ -393,14 +393,14 @@
                                     <property name="text">
                                         <string>High</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="whatsThis" stdset="0">
                                         <string>The priority that the command will be run with can be set here. From left to right, it goes from low to high. The center position is the default value. For priorities higher than the default, you will need to provide the root password.</string>
                                     </property>
                                 </widget>
-                                <widget class="QSlider" row="0" column="0" rowspan="1" colspan="2">
+                                <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="2">
                                     <property name="name">
                                         <cstring>slPriority</cstring>
                                     </property>
@@ -427,7 +427,7 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="4">
+                        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4">
                             <property name="name">
                                 <cstring>cbRunAsOther</cstring>
                             </property>
@@ -448,7 +448,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
@@ -459,7 +459,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QFrame" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQFrame" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>separator</cstring>
             </property>
@@ -478,7 +478,7 @@
                 <enum>Sunken</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>lbCommand</cstring>
             </property>
@@ -500,7 +500,7 @@
                 <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.kderc".</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>lbRunIcon</cstring>
             </property>
@@ -515,7 +515,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -531,7 +531,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>388</width>
                     <height>0</height>
@@ -541,7 +541,7 @@
                 <string>Enter the command you wish to execute or the address of the resource you want to open. This can be a remote URL like "www.kde.org" or a local one like "~/.kderc".</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="1">
+        <widget class="TQLabel" row="0" column="1">
             <property name="name">
                 <cstring>lbComment</cstring>
             </property>
@@ -556,7 +556,7 @@
             <property name="text">
                 <string>Enter the name of the application you want to run or the URL you want to view</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index bc869d341..17c1ee04e 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -58,7 +58,7 @@ KPixmapServer::~KPixmapServer()
 
 void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
 {
-    if (m_Names.contains(name)) 
+    if (m_Names.tqcontains(name)) 
     {
 	if (overwrite)
 	    remove(name);
@@ -77,7 +77,7 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
     si.handle = pm->handle();
     m_Selections[sel] = si;
 
-    DataIterator it = m_Data.find(pm->handle());
+    DataIterator it = m_Data.tqfind(pm->handle());
     if (it == m_Data.end()) 
     {
 	KPixmapData data;
@@ -95,20 +95,20 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
 void KPixmapServer::remove(TQString name)
 {
     // Remove the name
-    NameIterator it = m_Names.find(name);
+    NameIterator it = m_Names.tqfind(name);
     if (it == m_Names.end())
 	return;
     KPixmapInode pi = it.data();
     m_Names.remove(it);
 
     // Remove and disown the selection
-    SelectionIterator it2 = m_Selections.find(pi.selection);
+    SelectionIterator it2 = m_Selections.tqfind(pi.selection);
     assert(it2 != m_Selections.end());
     m_Selections.remove(it2);
     XSetSelectionOwner(qt_xdisplay(), pi.selection, None, CurrentTime);
 
     // Decrease refcount on data
-    DataIterator it3 = m_Data.find(pi.handle);
+    DataIterator it3 = m_Data.tqfind(pi.handle);
     assert(it3 != m_Data.end());
     it3.data().refcount--;
     if (!it3.data().refcount && !it3.data().usecount) 
@@ -131,7 +131,7 @@ TQStringList KPixmapServer::list()
 
 void KPixmapServer::setOwner(TQString name)
 {
-    NameIterator it = m_Names.find(name);
+    NameIterator it = m_Names.tqfind(name);
     if (it == m_Names.end())
 	return;
 
@@ -160,7 +160,7 @@ bool KPixmapServer::x11Event(XEvent *event)
 
 	// Check if we know about this selection
 	Atom sel = ev->selection;
-	SelectionIterator it = m_Selections.find(sel);
+	SelectionIterator it = m_Selections.tqfind(sel);
 	if (it == m_Selections.end())
 	    return false;
 	KSelectionInode si = it.data();
@@ -174,7 +174,7 @@ bool KPixmapServer::x11Event(XEvent *event)
 	}
 
 	// Check if there is no transaction in progress to the same property
-	if (m_Active.contains(ev->property)) 
+	if (m_Active.tqcontains(ev->property)) 
 	{
 	    kdDebug(1204) << ID << "selection is busy.\n";
 	    XSendEvent(qt_xdisplay(), ev->requestor, false, 0, &reply);
@@ -182,7 +182,7 @@ bool KPixmapServer::x11Event(XEvent *event)
 	}
 
 	// Check if the selection was not deleted
-	DataIterator it2 = m_Data.find(si.handle);
+	DataIterator it2 = m_Data.tqfind(si.handle);
 	if (it2 == m_Data.end()) 
 	{
 	    kdDebug(1204) << ID << "selection has been deleted.\n";
@@ -216,13 +216,13 @@ bool KPixmapServer::x11Event(XEvent *event)
     {
 	XPropertyEvent *ev = &event->xproperty;
 
-	AtomIterator it = m_Active.find(ev->atom);
+	AtomIterator it = m_Active.tqfind(ev->atom);
 	if (it == m_Active.end())
 	    return false;
 	HANDLE handle = it.data();
 	m_Active.remove(it);
 
-	DataIterator it2 = m_Data.find(handle);
+	DataIterator it2 = m_Data.tqfind(handle);
 	assert(it2 != m_Data.end());
 	it2.data().usecount--;
 	if (!it2.data().usecount && !it2.data().refcount) 
@@ -239,7 +239,7 @@ bool KPixmapServer::x11Event(XEvent *event)
     {
 	XSelectionClearEvent *ev = &event->xselectionclear;
 
-	SelectionIterator it = m_Selections.find(ev->selection);
+	SelectionIterator it = m_Selections.tqfind(ev->selection);
 	if (it == m_Selections.end())
 	    return false;
 
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index 009b70fc8..f5c877f17 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -48,7 +48,7 @@ struct KSelectionInode
  *
  * @author Geert Jansen <g.t.jansen@stud.tue.nl>
  */
-class KPixmapServer: public QWidget
+class KPixmapServer: public TQWidget
 {
     Q_OBJECT
 
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 720dd4bba..b534fe8ad 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -218,8 +218,8 @@ void StartupId::start_startupid( const TQString& icon_P )
         }
     else
         {
-        if( icon_pixmap.mask() != NULL )
-            startup_widget->setMask( *icon_pixmap.mask());
+        if( icon_pixmap.tqmask() != NULL )
+            startup_widget->setMask( *icon_pixmap.tqmask());
         else
             startup_widget->clearMask();
         startup_widget->setBackgroundPixmap( icon_pixmap );
@@ -257,8 +257,8 @@ void StartupId::update_startupid()
         yoffset = frame_to_yoffset[ frame ];
         TQPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ];
         startup_widget->setBackgroundPixmap( pm );
-        if ( pm.mask() != NULL )
-            startup_widget->setMask( *pm.mask() );
+        if ( pm.tqmask() != NULL )
+            startup_widget->setMask( *pm.tqmask() );
         else
             startup_widget->clearMask();
         if ( ++frame >= ( sizeof( frame_to_yoffset ) / sizeof( frame_to_yoffset[ 0 ] ) ) )
diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h
index d54b72730..62e7031db 100644
--- a/kdesktop/startupid.h
+++ b/kdesktop/startupid.h
@@ -32,7 +32,7 @@
 class TQStyle;
 
 class StartupId
-    : public QWidget
+    : public TQWidget
     {
     Q_OBJECT
     public:
diff --git a/kdesktop/xautolock.h b/kdesktop/xautolock.h
index 35b53207a..5684ce6ef 100644
--- a/kdesktop/xautolock.h
+++ b/kdesktop/xautolock.h
@@ -17,7 +17,7 @@
 // Detect user inactivity.
 // Named XAutoLock after the program that it is based on.
 //
-class XAutoLock : public QWidget
+class XAutoLock : public TQWidget
 {
     Q_OBJECT
 public: