TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 11 insertions, 11 deletions

diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index f8286ed6..ba169e4f 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -152,7 +152,7 @@ void DisplayMgrMDI::setCaption(TQWidget *w, const TQString& cap)
     w->setCaption(cap);
 
     TQString esc = cap;
-    esc.replace("&", "&&");
+    esc.tqreplace("&", "&&");
     kdDebug(5008) << "Set caption: " << esc << endl;
 
     m_topLevel->tabWidget()->setTabLabel( w, esc );
@@ -178,12 +178,12 @@ void DisplayMgrMDI::reparentReq()
 {
     kdDebug(5008) << "got reparent" << endl;
 
-    TQWidget *o = kapp->focusWidget();
+    TQWidget *o = kapp->tqfocusWidget();
     TQWidget *s;
 
     if(o == NULL){
         kdDebug(5008) << "Kapp says no widget has focus!" << endl;
-        o = kapp->activeWindow();
+        o = TQT_TQWIDGET(kapp->activeWindow());
 
         if(o->inherits("KMainWindow") == false)
             return;
@@ -196,9 +196,9 @@ void DisplayMgrMDI::reparentReq()
 
 
         s = o;
-        while(s->parentWidget()){
+        while(s->tqparentWidget()){
             kdDebug(5008) << "Got a: " << s->className() << endl;
-            s = s->parentWidget();
+            s = s->tqparentWidget();
             if(s->inherits("KMainWindow"))
                 break;
 
@@ -213,10 +213,10 @@ void DisplayMgrMDI::reparentReq()
 
         TQMenuData *tmenu = kst->menuBar();
         if(tmenu){
-            TQMenuItem *menui = tmenu->findItem(DMM_MDI_ID);
+            TQMenuItem *menui = tmenu->tqfindItem(DMM_MDI_ID);
             if(menui){
                 TQMenuData *cmenu = menui->popup();
-                if(cmenu->findItem(DMM_DEATCH_ID) && cmenu->isItemChecked(DMM_DEATCH_ID)){
+                if(cmenu->tqfindItem(DMM_DEATCH_ID) && cmenu->isItemChecked(DMM_DEATCH_ID)){
                     kst->reparent( topLevel()->tabWidget(), 0, TQPoint( 0, 0 ), true );
                     show(kst);
                     cmenu->setItemChecked(DMM_DEATCH_ID, false);
@@ -239,8 +239,8 @@ MDITopLevel *DisplayMgrMDI::topLevel()
         m_topLevel->show();
 
         KAccel *a = new KAccel( m_topLevel );
-        a->insert( "cycle left", i18n("Cycle left"), TQString::null, ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) );
-        a->insert( "cycle right", i18n("Cycle right"), TQString::null, ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) );
+        a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) );
+        a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) );
     }
 
     return m_topLevel;
@@ -293,9 +293,9 @@ void DisplayMgrMDI::moveWindow(int step)
 
         m_topLevel->setUpdatesEnabled(false);
         m_topLevel->hideWidget(w);
-	int space = w->caption().find(" ");
+	int space = w->caption().tqfind(" ");
 	TQString esc = space < 1 ? w->caption():w->caption().left(space);
-	esc.replace("&", "&&");
+	esc.tqreplace("&", "&&");
 	kdDebug(5008) << "Insert tab: " << esc << endl;
         m_topLevel->tabWidget()->insertTab( w, esc, index );
         m_topLevel->tabWidget()->showPage( w );