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

6 files changed, 50 insertions, 50 deletions

diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui
index 814a3867c..6f03509b9 100644
--- a/kcontrol/screensaver/advanceddialogimpl.ui
+++ b/kcontrol/screensaver/advanceddialogimpl.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AdvancedDialogImpl</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>qgbPriority</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="0" column="0">
+                <widget class="TQComboBox" row="0" column="0">
                     <item>
                         <property name="text">
                             <string>Low</string>
@@ -69,7 +69,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
@@ -78,7 +78,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -89,7 +89,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="3" column="0" rowspan="2" colspan="2">
+                <widget class="TQLabel" row="3" column="0" rowspan="2" colspan="2">
                     <property name="name">
                         <cstring>qlMonitorLabel</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>layout8</cstring>
                     </property>
@@ -105,7 +105,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout1</cstring>
                             </property>
@@ -113,7 +113,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>qlTopLeft</cstring>
                                     </property>
@@ -121,7 +121,7 @@
                                         <string>Top left:</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>No Action</string>
@@ -153,14 +153,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout3</cstring>
                             </property>
@@ -168,7 +168,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>qlTopRight</cstring>
                                     </property>
@@ -176,7 +176,7 @@
                                         <string>Top right:</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>No Action</string>
@@ -200,7 +200,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>layout9</cstring>
                     </property>
@@ -208,7 +208,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout4</cstring>
                             </property>
@@ -216,7 +216,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>qlBottomLeft</cstring>
                                     </property>
@@ -224,7 +224,7 @@
                                         <string>Bottom left:</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>No Action</string>
@@ -256,14 +256,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>layout2</cstring>
                             </property>
@@ -271,7 +271,7 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>qlBottomRight</cstring>
                                     </property>
@@ -279,7 +279,7 @@
                                         <string>Bottom right:</string>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>No Action</string>
@@ -303,7 +303,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>layout10</cstring>
                     </property>
@@ -321,14 +321,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>monitorLabel</cstring>
                             </property>
@@ -346,7 +346,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -365,7 +365,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -382,7 +382,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp
index d13d131dc..66ba882d0 100644
--- a/kcontrol/screensaver/kswidget.cpp
+++ b/kcontrol/screensaver/kswidget.cpp
@@ -8,7 +8,7 @@
 #endif
 
 KSWidget::KSWidget( TQWidget* parent, const char* name, int f )
-    : QXEmbed( parent, name, f ), colormap( None )
+    : QXEmbed( parent, name, (WFlags)f ), colormap( None )
 {
 // use visual with support for double-buffering, for opengl
 // this code is duplicated in kdebase/kdesktop/lock/
@@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f )
             }
         }
     }
-    Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
+    Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
         x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs );
     create( w );
 #endif
diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp
index bf8cdc54a..a7185135e 100644
--- a/kcontrol/screensaver/saverconfig.cpp
+++ b/kcontrol/screensaver/saverconfig.cpp
@@ -29,7 +29,7 @@ bool SaverConfig::read(const TQString &file)
       mSaver = config.readPathEntry("Exec");
     }
 
-    int indx = file.findRev('/');
+    int indx = file.tqfindRev('/');
     if (indx >= 0) {
         mFile = file.mid(indx+1);
     }
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index f80cc19e9..7582aea53 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -133,12 +133,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
     vLayout->addWidget(mSaverGroup);
     vLayout->setStretchFactor( mSaverGroup, 10 );
-    TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
+    TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(),
         KDialog::spacingHint() );
 
     mSaverListView = new TQListView( mSaverGroup );
     mSaverListView->setMinimumHeight( 120 );
-    mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+    mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
     mSaverListView->addColumn("");
     mSaverListView->header()->hide();
     mSelected = -1;
@@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
     mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
     leftColumnLayout->addWidget( mSettingsGroup );
-    groupLayout = new TQVBoxLayout( mSettingsGroup->layout(),
+    groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(),
         KDialog::spacingHint() );
 
     mEnabledCheckBox = new TQCheckBox(i18n(
@@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mWaitLockEdit->setSuffix(i18n(" sec"));
     mWaitLockEdit->setValue(mLockTimeout/1000);
     mWaitLockEdit->setEnabled(mEnabled && mLock);
-    if ( mWaitLockEdit->sizeHint().width() <
-         mWaitEdit->sizeHint().width() ) {
-        mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
-        mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
+    if ( mWaitLockEdit->tqsizeHint().width() <
+         mWaitEdit->tqsizeHint().width() ) {
+        mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
+        mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
     }
     else {
-        mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
-        mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
+        mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() );
+        mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() );
     }
     connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)),
             this, TQT_SLOT(slotLockTimeoutChanged(int)));
@@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         new TQVBoxLayout(topLayout, KDialog::spacingHint());
 
     mMonitorLabel = new TQLabel( this );
-    mMonitorLabel->setAlignment( AlignCenter );
+    mMonitorLabel->tqsetAlignment( AlignCenter );
     mMonitorLabel->setPixmap( TQPixmap(locate("data",
                          "kcontrol/pics/monitor.png")));
     rightColumnLayout->addWidget(mMonitorLabel, 0);
@@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     advancedLayout->addWidget( new TQWidget( this ) );
     TQPushButton* advancedBt = new TQPushButton(
         i18n( "Advanced &Options" ), this, "advancedBtn" );
-    advancedBt->setSizePolicy( TQSizePolicy(
+    advancedBt->tqsetSizePolicy( TQSizePolicy(
         TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
     connect( advancedBt, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( slotAdvanced() ) );
@@ -360,7 +360,7 @@ void KScreenSaver::load( bool useDefaults )
     for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) {
         if (saver->file() == mSaver)
         {
-            selectedItem = mSaverListView->findItem ( saver->name(), 0 );
+            selectedItem = mSaverListView->tqfindItem ( saver->name(), 0 );
             if (selectedItem) {
                 mSelected = i;
                 break;
@@ -454,7 +454,7 @@ void KScreenSaver::save()
     // on exit. I don't know why yet.
 
     DCOPClient *client = kapp->dcopClient();
-    client->send("kdesktop", "KScreensaverIface", "configure()", "");
+    client->send("kdesktop", "KScreensaverIface", "configure()", TQString(""));
 
     mChanged = false;
     emit changed(false);
@@ -503,7 +503,7 @@ void KScreenSaver::findSavers()
                 item = new TQListViewItem ( mSaverListView, s->name(), "2" + s->name() );
             else
             {
-                TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 );
+                TQListViewItem *categoryItem = mSaverListView->tqfindItem( s->category(), 0 );
                 if ( !categoryItem ) {
                     categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() );
                     categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) );
@@ -639,9 +639,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item)
 
     int i = 0, indx = -1;
     for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) {
-        if ( item->parent() )
+        if ( item->tqparent() )
         {
-            if (  item->parent()->text( 0 ) == saver->category() && saver->name() == item->text (0))
+            if (  item->tqparent()->text( 0 ) == saver->category() && saver->name() == item->text (0))
             {
                 indx = i;
                 break;
@@ -739,7 +739,7 @@ void KScreenSaver::slotSetup()
 //
 void KScreenSaver::slotAdvanced()
 {
-   KScreenSaverAdvancedDialog dlg( topLevelWidget() );
+   KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() );
    if ( dlg.exec() ) {
        mChanged = true;
        emit changed(true);
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index b03bd878b..9dcf7f46e 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -81,7 +81,7 @@ protected:
     TQPushButton *mSetupBt;
     TQPushButton *mTestBt;
     TQListView   *mSaverListView;
-    QSpinBox	*mWaitEdit;
+    TQSpinBox	*mWaitEdit;
     TQSpinBox    *mWaitLockEdit;
     TQCheckBox   *mLockCheckBox;
     TQCheckBox   *mStarsCheckBox;
diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp
index a5d316be5..3676c0db7 100644
--- a/kcontrol/screensaver/testwin.cpp
+++ b/kcontrol/screensaver/testwin.cpp
@@ -6,7 +6,7 @@ class QXEmbed;
 TestWin::TestWin()
     : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM )
 {
-    setFocusPolicy(StrongFocus);
+    setFocusPolicy(TQ_StrongFocus);
     KWin::setState( winId(), NET::StaysOnTop );
 }