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

1 files changed, 23 insertions, 23 deletions

diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index e521f1e28..b8ecf9ddf 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -76,7 +76,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
     if (w > 0 && h > 0)
         resize(w,h);
     else
-        resize(m_pPager->sizeHint());
+        resize(m_pPager->tqsizeHint());
     //  resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90));
 
     int xpos=cfg->readNumEntry("xPos",-1);
@@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
 //	  rect.pos.y+rect.size.height-m_pPager->height());
 // antonio:The above lines don't work. I should look at them when I have
 // more time
-        move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25);
+        move(kapp->desktop()->width()-m_pPager->tqsizeHint().width()-5,kapp->desktop()->height()-m_pPager->tqsizeHint().height()-25);
     }
 
     // Set the wm flags to this window
@@ -178,7 +178,7 @@ void KPagerMainWindow::toggleShow(int x, int y)
 }
 
 KPager::KPager(KPagerMainWindow *parent, const char *name)
-	: TQFrame (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_Tool)
+	: TQFrame (parent, name, (WFlags)(WStyle_Customize | WStyle_NoBorder | WStyle_Tool))
     , m_layout(0)
     , m_mnu(0)
     , m_smnu(0)
@@ -187,7 +187,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
     m_windows.setAutoDelete(true); // delete windows info after removal
 
     setBackgroundColor( black );
-    m_winmodule=new KWinModule(this);
+    m_winmodule=new KWinModule(TQT_TQOBJECT(this));
     m_currentDesktop=m_winmodule->currentDesktop();
 
     m_grabWinTimer=new TQTimer(this,"grabWinTimer");
@@ -231,8 +231,8 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
     defFont = cfg->readFontEntry("Font", &defFont);
     setFont(defFont);
 
-    m_prefs_action = KStdAction::preferences(this, TQT_SLOT(configureDialog()), parent->actionCollection());
-    m_quit_action = KStdAction::quit(kapp, TQT_SLOT(quit()), parent->actionCollection());
+    m_prefs_action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureDialog()), parent->actionCollection());
+    m_quit_action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), parent->actionCollection());
 
     updateLayout();
 }
@@ -374,7 +374,7 @@ void KPager::configureDialog()
 
         updateLayout();
         for( TQValueList <Desktop *>::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it )
-            (*it)->repaint();
+            (*it)->tqrepaint();
     }
 }
 
@@ -409,7 +409,7 @@ void KPager::slotActiveWindowChanged( WId win )
     {
         if ( (inf1 && inf1->isOnDesktop(i))
              || (inf2 && inf2->isOnDesktop(i) ) )
-            m_desktops[i-1]->repaint(false);
+            m_desktops[i-1]->tqrepaint(false);
     }
 }
 
@@ -422,7 +422,7 @@ void KPager::slotWindowAdded( WId win)
     for ( int i=1; i <= (int) m_desktops.count(); ++i)
     {
         if ( inf->isOnDesktop( i ))
-            m_desktops[i-1]->repaint(false);
+            m_desktops[i-1]->tqrepaint(false);
     }
 }
 
@@ -438,14 +438,14 @@ void KPager::slotWindowRemoved( WId win )
         for (int i = 1; i <= (int) m_desktops.count(); ++i)
         {
             if (onAllDesktops || desktop == i)
-                m_desktops[i-1]->repaint(false);
+                m_desktops[i-1]->tqrepaint(false);
         }
     }
 }
 
 void KPager::slotWindowChanged( WId win , unsigned int prop)
 {
-    bool repaint=false;
+    bool tqrepaint=false;
 
     KWin::WindowInfo* inf = m_windows[win];
     if (!inf)
@@ -453,7 +453,7 @@ void KPager::slotWindowChanged( WId win , unsigned int prop)
       inf=info(win);
       prop=0; // info already calls KWin::info, so there's no need
       // to update anything else.
-      repaint=true;
+      tqrepaint=true;
     };
 
     bool onAllDesktops = inf ? inf->onAllDesktops() : false;
@@ -466,15 +466,15 @@ void KPager::slotWindowChanged( WId win , unsigned int prop)
     }
     
     if((prop & ~( NET::WMName | NET::WMVisibleName )) != 0 )
-	repaint = true;
+	tqrepaint = true;
 
-    if (repaint)
+    if (tqrepaint)
     for ( int i=1; i <= (int) m_desktops.count(); ++i)
     {
       if ((inf && (inf->isOnDesktop(i)))
 	  || onAllDesktops || desktop == i )
         {
-            m_desktops[i-1]->repaint(false);
+            m_desktops[i-1]->tqrepaint(false);
         }
     }
 //	redrawDesktops();
@@ -485,9 +485,9 @@ void KPager::slotStackingOrderChanged()
     m_desktops[m_currentDesktop-1]->m_grabWindows=true;
     for ( int i=1; i <= (int) m_desktops.count(); ++i)
     {
-        m_desktops[i-1]->repaint(false);
+        m_desktops[i-1]->tqrepaint(false);
     }
-//    repaint(true);
+//    tqrepaint(true);
 }
 
 void KPager::slotDesktopNamesChanged()
@@ -547,8 +547,8 @@ void KPager::slotCurrentDesktopChanged(int desk)
     m_desktops[m_currentDesktop-1]->update();
     m_desktops[desk-1]->paintFrame( true );
     m_desktops[desk-1]->update();
-//    m_desktops[m_currentDesktop-1]->repaint();
-//    m_desktops[desk-1]->repaint();
+//    m_desktops[m_currentDesktop-1]->tqrepaint();
+//    m_desktops[desk-1]->tqrepaint();
 
     m_currentDesktop=desk;
 
@@ -643,21 +643,21 @@ void KPager::redrawDesktops()
 {
     TQValueList <Desktop *>::Iterator it;
     for( it = m_desktops.begin(); it != m_desktops.end(); ++it )
-        (*it)->repaint();
+        (*it)->tqrepaint();
 }
 
 void KPager::slotGrabWindows()
 {
     m_desktops[m_currentDesktop-1]->m_grabWindows=true;
-    m_desktops[m_currentDesktop-1]->repaint();
+    m_desktops[m_currentDesktop-1]->tqrepaint();
 }
 
-TQSize KPager::sizeHint() const
+TQSize KPager::tqsizeHint() const
 {
     int n=m_desktops.count();
     int w=-1,h=-1;
 
-    TQSize size=m_desktops[0]->sizeHint();
+    TQSize size=m_desktops[0]->tqsizeHint();
     int wDsk=size.width();
     int hDsk=size.height();
     switch (m_layoutType)