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

7 files changed, 51 insertions, 51 deletions

diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index af6c12cc4..c68ac6681 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
     winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
     winPixmap->setPixmap(TQPixmap(locate("data",
                                         "kcontrol/pics/onlyone.png")));
-    winPixmap->setFixedSize( winPixmap->sizeHint() );
+    winPixmap->setFixedSize( winPixmap->tqsizeHint() );
 
 
    // ----
@@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
     TQHBox *hboxpreview = new TQHBox(vbox);
     TQWidget* spacer = new TQWidget( hboxpreview );
     spacer->setMinimumSize( 20, 0 );
-    spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+    spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
     cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
     connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 98275995c..e7d333537 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -87,7 +87,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   // name group
   TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
 
-  name_group->setColumnLayout(4, Horizontal);
+  name_group->setColumnLayout(4, Qt::Horizontal);
 
   for(int i = 0; i < (maxDesktops/2); i++)
     {
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index 6e614b022..12537d56a 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>DesktopBehaviorBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DesktopBehaviorBase</cstring>
     </property>
@@ -22,11 +22,11 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>behaviorTab</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -37,7 +37,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>iconsEnabledBox</cstring>
                         </property>
@@ -56,7 +56,7 @@
                             <string>Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop will be somewhat faster but you will no longer be able to drag files to the desktop.</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="0">
+                    <widget class="TQLayoutWidget" row="1" column="0">
                         <property name="name">
                             <cstring>layout1</cstring>
                         </property>
@@ -74,14 +74,14 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>vrootBox</cstring>
                                 </property>
@@ -97,7 +97,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QCheckBox" row="2" column="0">
+                    <widget class="TQCheckBox" row="2" column="0">
                         <property name="name">
                             <cstring>toolTipBox</cstring>
                         </property>
@@ -105,7 +105,7 @@
                             <string>Show &amp;tooltips</string>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup" row="3" column="0">
+                    <widget class="TQButtonGroup" row="3" column="0">
                         <property name="name">
                             <cstring>desktopMenuGroup</cstring>
                         </property>
@@ -116,7 +116,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>radioButton1</cstring>
                                 </property>
@@ -127,7 +127,7 @@
                                     <string>If this option is selected, there is no menu bar at the top of the screen.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>radioButton1_2</cstring>
                                 </property>
@@ -138,7 +138,7 @@
                                     <string>If this option is selected, there is one menu bar at the top of the screen which shows the desktop menus.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton">
+                            <widget class="TQRadioButton">
                                 <property name="name">
                                     <cstring>radioButton1_3</cstring>
                                 </property>
@@ -151,7 +151,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox" row="4" column="0">
+                    <widget class="TQGroupBox" row="4" column="0">
                         <property name="name">
                             <cstring>groupBox3</cstring>
                         </property>
@@ -162,7 +162,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>middleLabel</cstring>
                                 </property>
@@ -170,7 +170,7 @@
                                     <string>Middle button:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>leftLabel</cstring>
                                 </property>
@@ -178,7 +178,7 @@
                                     <string>Left button:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>rightLabel</cstring>
                                 </property>
@@ -186,7 +186,7 @@
                                     <string>Right button:</string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="2" column="1">
+                            <widget class="TQComboBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>rightComboBox</cstring>
                                 </property>
@@ -199,7 +199,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="0" column="1">
+                            <widget class="TQComboBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>leftComboBox</cstring>
                                 </property>
@@ -212,7 +212,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="2">
+                            <widget class="TQPushButton" row="0" column="2">
                                 <property name="name">
                                     <cstring>leftEditButton</cstring>
                                 </property>
@@ -223,7 +223,7 @@
                                     <string>Edit...</string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="1" column="1">
+                            <widget class="TQComboBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>middleComboBox</cstring>
                                 </property>
@@ -236,7 +236,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="2">
+                            <widget class="TQPushButton" row="1" column="2">
                                 <property name="name">
                                     <cstring>middleEditButton</cstring>
                                 </property>
@@ -247,7 +247,7 @@
                                     <string>Edit...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="2" column="2">
+                            <widget class="TQPushButton" row="2" column="2">
                                 <property name="name">
                                     <cstring>rightEditButton</cstring>
                                 </property>
@@ -268,7 +268,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>191</width>
                                         <height>80</height>
@@ -287,7 +287,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -296,7 +296,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -307,7 +307,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>autoLineupIconsBox</cstring>
                         </property>
@@ -318,7 +318,7 @@
                             <string>Check this option if you want to see your icons automatically aligned to the grid when you move them.</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="0">
+                    <widget class="TQCheckBox" row="1" column="0">
                         <property name="name">
                             <cstring>showHiddenBox</cstring>
                         </property>
@@ -354,7 +354,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -365,7 +365,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>enableMediaBox</cstring>
                         </property>
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 6b4aaadb0..ab84300d4 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -60,7 +60,7 @@ void DesktopBehaviorModule::changed()
     emit KCModule::changed( true );
 }
 
-class DesktopBehaviorPreviewItem : public QCheckListItem
+class DesktopBehaviorPreviewItem : public TQCheckListItem
 {
 public:
     DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent,
@@ -90,7 +90,7 @@ private:
 };
 
 
-class DesktopBehaviorMediaItem : public QCheckListItem
+class DesktopBehaviorMediaItem : public TQCheckListItem
 {
 public:
     DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, TQListView *parent,
@@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
    */
   bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
 
-  m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
+  m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"));
 
   connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
   connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
@@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
 
   if ( leftHandedMouse )
   {
-     qSwap(strMouseButton1, strMouseButton3);
-     qSwap(strButtonTxt1, strButtonTxt3);
+     tqSwap(strMouseButton1, strMouseButton3);
+     tqSwap(strButtonTxt1, strButtonTxt3);
   }
 
   leftLabel->setText( strMouseButton1 );
@@ -259,7 +259,7 @@ void DesktopBehavior::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 (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok);
         }
     }
@@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults )
     previewListView->clear();
     TQStringList previews = g_pConfig->readListEntry("Preview");
     for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
-        new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
-    new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
+        new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName()));
+    new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/"));
     //
     g_pConfig->setGroup( "FMSettings" );
     toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) );
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index 98c804adc..07ee4663e 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -94,7 +94,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop,
     m_pNormalText = new KColorButton( normalTextColor, this );
     label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this );
     lay->addWidget(label,row,0);
-    lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,hAlign);
+    lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign);
 
     wtstr = i18n("This is the color used to display text in Konqueror windows.");
     TQWhatsThis::add( label, wtstr );
@@ -129,7 +129,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop,
                  TQT_SLOT( slotTextBackgroundClicked() ) );
 
         m_pTextBackground = new KColorButton( textBackgroundColor, this );
-        lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,hAlign);
+        lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign);
 
         wtstr = i18n("This is the color used behind the text for the icons on the desktop.");
         TQWhatsThis::add( label, wtstr );
@@ -179,7 +179,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop,
     }
 
     cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
-    lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,hAlign);
+    lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign);
     connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
 
     TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames"
@@ -192,7 +192,7 @@ KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop,
         row++;
 
         m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
-        lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,hAlign );
+        lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign );
         connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
 
         TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes"
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 0e3ea0861..cbe4d40a7 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -39,7 +39,7 @@
 
 //-----------------------------------------------------------------------------
 
-class PreviewCheckListItem : public QCheckListItem
+class PreviewCheckListItem : public TQCheckListItem
 {
   public:
     PreviewCheckListItem( TQListView *parent, const TQString &text )
@@ -198,7 +198,7 @@ void KPreviewOptions::save()
         group.writeEntry( protocol, it.current()->isOn(), true, true );
     }
     // config key is in bytes, numinput is in MB
-    group.writeEntry( "MaximumSize", qRound( m_maxSize->value() *1024*1024 ), true, true );
+    group.writeEntry( "MaximumSize", tqRound( m_maxSize->value() *1024*1024 ), true, true );
     group.writeEntry( "BoostSize", m_boostSize->isChecked(), true, true );
     group.writeEntry( "UseFileThumbnails", m_useFileThumbnails->isChecked(), true, true );
     group.sync();
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index f4111cfda..4576433a9 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             KIO::ListJob* job = KIO::listDir( src );
             connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
                      this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) );
-            qApp->enter_loop();
+            tqApp->enter_loop();
 
             if (m_ok)
             {
@@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             KIO::Job * job = KIO::move( src, dest );
             connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
             // wait for job
-            qApp->enter_loop();
+            tqApp->enter_loop();
         }
     }
     kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl;
@@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li
 
         KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest );
         connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-        qApp->enter_loop();
+        tqApp->enter_loop();
     }
-    qApp->exit_loop();
+    tqApp->exit_loop();
 }
 
 void DesktopPathConfig::slotResult( KIO::Job * job )
@@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job )
 
         job->showErrorDialog(this);
     }
-    qApp->exit_loop();
+    tqApp->exit_loop();
 }
 
 #include "rootopts.moc"