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

9 files changed, 54 insertions, 54 deletions

diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui
index 7116bc1ee..5df531f10 100644
--- a/kcontrol/konqhtml/advancedTabOptions.ui
+++ b/kcontrol/konqhtml/advancedTabOptions.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>advancedTabOptions</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>advancedTabOptions</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -41,7 +41,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_pNewTabsInBackground</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <string>This will open a new tab in the background, instead of in the foreground.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_pOpenAfterCurrentPage</cstring>
                     </property>
@@ -71,7 +71,7 @@
                         <string>This will open a new tab opened from a page after the current tab, instead of after the last tab.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_pTabConfirm</cstring>
                     </property>
@@ -82,7 +82,7 @@
                         <string>This will ask you whether you are sure you want to close a window when it has multiple tabs opened in it.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_pPermanentCloseButton</cstring>
                     </property>
@@ -93,7 +93,7 @@
                         <string>This will display close buttons inside each tab instead of websites' icons.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                        <cstring>m_pPopupsWithinTabs</cstring>
                     </property>
@@ -104,7 +104,7 @@
                        <string>Whether or not JavaScript popups if allowed shall open in a new tab or in a new window.</string>
                    </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                        <cstring>m_pTabCloseActivatePrevious</cstring>
                     </property>
@@ -115,7 +115,7 @@
                        <string>When checking this the previous used or opened tab will be activated when you close the current active tab instead of the one right to the current tab.</string>
                    </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_pKonquerorTabforExternalURL</cstring>
                     </property>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 0c15acebe..8c832e770 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -40,7 +40,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget
   int r = 0;
   int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons
 
-  TQGroupBox* gb = new TQGroupBox( 1, TQGroupBox::Horizontal, i18n("Font Si&ze"), this );
+  TQGroupBox* gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this );
   lay->addMultiCellWidget(gb, r, r, E, W);
 
   TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") );
@@ -231,7 +231,7 @@ KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget
 
   TQFontDatabase db;
 
-  m_families = db.families();
+  m_families = db.tqfamilies();
 
   m_pFonts[0]->setFonts( m_families );
   m_pFonts[1]->setFonts( m_families );
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 29dccb14b..a2c7ceb53 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -39,7 +39,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
   layout()->setSpacing(0);
   layout()->setMargin(0);
   TQGridLayout* thisLayout = new TQGridLayout(layout());
-  thisLayout->setAlignment(Qt::AlignTop);
+  thisLayout->tqsetAlignment(Qt::AlignTop);
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
 
@@ -163,7 +163,7 @@ void DomainListView::deletePressed()
         return;
     }
 
-    DomainPolicyMap::Iterator it = domainPolicies.find(index);
+    DomainPolicyMap::Iterator it = domainPolicies.tqfind(index);
     if (it != domainPolicies.end()) {
       delete it.data();
       domainPolicies.remove(it);
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 79ab4d45a..c7bb2bdbd 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -55,7 +55,7 @@ KCMFilter::KCMFilter(KConfig *config, TQString group,
     mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this);
     topLayout->addWidget( mKillCheck );
 
-    TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("URL Expressions to Filter"), this );
+    TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("URL Expressions to Filter"), this );
     topLayout->addWidget( topBox );
 
     mListBox = new TQListBox( topBox );
@@ -189,7 +189,7 @@ void KCMFilter::importFilters()
                     }
                 }
 
-                if (!line.isEmpty() && mListBox->findItem(line, Qt::CaseSensitive|Qt::ExactMatch) == 0)
+                if (!line.isEmpty() && mListBox->tqfindItem(line, TQt::CaseSensitive|TQt::ExactMatch) == 0)
                     paths.append(line);
             }
             f.close();
@@ -267,7 +267,7 @@ void KCMFilter::load( bool useDefaults )
     for (int i=0; i<num; ++i)
     {
         TQString key = "Filter-" + TQString::number(i);
-        it = entryMap.find(key);
+        it = entryMap.tqfind(key);
         if (it != entryMap.end())
             paths.append(it.data());
     }
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 3cca58732..e6a6c59bb 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -81,7 +81,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
     // Tabbed Browsing
 
     TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
-    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
+    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() );
 
     m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
     TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
@@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
     TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this );
 
     m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
-    TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
+    TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change "
        "(usually to a hand) if it is moved over a hyperlink.") );
     connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
 
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index ae73fc686..e50224f53 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -45,7 +45,7 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidge
   TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 );
 
   // the global checkbox
-  TQGroupBox* globalGB = new TQGroupBox( 2, Vertical, i18n( "Global Settings" ), this );
+  TQGroupBox* globalGB = new TQGroupBox( 2, Qt::Vertical, i18n( "Global Settings" ), this );
   toplevel->addWidget( globalGB );
 
   enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB );
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 5196af8dd..eeedca18a 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -136,7 +136,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   layout()->setSpacing(0);
   layout()->setMargin(0);
   TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
-  this_layout->setAlignment(Qt::AlignTop);
+  this_layout->tqsetAlignment(Qt::AlignTop);
   this_layout->setSpacing(3);
   this_layout->setMargin(11);
 
@@ -362,19 +362,19 @@ JSPoliciesFrame::~JSPoliciesFrame() {
 
 void JSPoliciesFrame::refresh() {
   TQRadioButton *button;
-  button = static_cast<TQRadioButton *>(js_popup->find(
+  button = static_cast<TQRadioButton *>(js_popup->tqfind(
   		policies->window_open));
   if (button != 0) button->setChecked(true);
-  button = static_cast<TQRadioButton *>(js_resize->find(
+  button = static_cast<TQRadioButton *>(js_resize->tqfind(
   		policies->window_resize));
   if (button != 0) button->setChecked(true);
-  button = static_cast<TQRadioButton *>(js_move->find(
+  button = static_cast<TQRadioButton *>(js_move->tqfind(
   		policies->window_move));
   if (button != 0) button->setChecked(true);
-  button = static_cast<TQRadioButton *>(js_focus->find(
+  button = static_cast<TQRadioButton *>(js_focus->tqfind(
   		policies->window_focus));
   if (button != 0) button->setChecked(true);
-  button = static_cast<TQRadioButton *>(js_statusbar->find(
+  button = static_cast<TQRadioButton *>(js_statusbar->tqfind(
   		policies->window_status));
   if (button != 0) button->setChecked(true);
 }
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index d772595c2..23e4ac881 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>NSConfigWidget</class>
 <author>Stefan Schimanski &lt;1Stein@gmx.de&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NSConfigWidget</cstring>
     </property>
@@ -28,11 +28,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>TabWidget2</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -43,7 +43,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout1</cstring>
                         </property>
@@ -51,7 +51,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>scanButton</cstring>
                                 </property>
@@ -72,7 +72,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -81,7 +81,7 @@
                             </spacer>
                         </hbox>
                     </widget>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>scanAtStartup</cstring>
                         </property>
@@ -92,11 +92,11 @@
                             <string>If this option is enabled, KDE will look for new Netscape plugins every time it starts up. This makes it easier for you if you often install new plugins, but it may also slow down KDE startup. You might want to disable this option, especially if you seldom install plugins.</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>300</width>
                                 <height>0</height>
@@ -109,7 +109,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton" row="1" column="2">
+                            <widget class="TQPushButton" row="1" column="2">
                                 <property name="name">
                                     <cstring>dirRemove</cstring>
                                 </property>
@@ -120,7 +120,7 @@
                                     <string>&amp;Remove</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="2">
+                            <widget class="TQPushButton" row="0" column="2">
                                 <property name="name">
                                     <cstring>dirNew</cstring>
                                 </property>
@@ -139,7 +139,7 @@
                                     <number>18</number>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="3" column="2">
+                            <widget class="TQPushButton" row="3" column="2">
                                 <property name="name">
                                     <cstring>dirDown</cstring>
                                 </property>
@@ -150,7 +150,7 @@
                                     <string>Do&amp;wn</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="2" column="2">
+                            <widget class="TQPushButton" row="2" column="2">
                                 <property name="name">
                                     <cstring>dirUp</cstring>
                                 </property>
@@ -184,7 +184,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -195,7 +195,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -206,7 +206,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QListView" row="1" column="0">
+                    <widget class="TQListView" row="1" column="0">
                         <column>
                             <property name="text">
                                 <string>Information</string>
@@ -239,7 +239,7 @@
                             <string>Here you can see a list of the Netscape plugins KDE has found.</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>useArtsdsp</cstring>
                         </property>
@@ -264,7 +264,7 @@
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>qwidget.h</includehint>
+    <includehint>tqwidget.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index d5cd4cc2b..8640a9991 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -61,8 +61,8 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren
     enablePluginsGloballyCB = new TQCheckBox( i18n( "&Enable plugins globally" ), globalGB );
     enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB );
     enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB );
-    priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString::null), globalGB);
-    priority = new TQSlider(5, 100, 5, 100, Horizontal, globalGB);
+    priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB);
+    priority = new TQSlider(5, 100, 5, 100, Qt::Horizontal, globalGB);
     connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
     connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) );
     connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) );
@@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren
 
     TQFrame *hrule = new TQFrame(globalGB);
     hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
+    hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
 
     /**************************************************************************
      ********************* Domain-specific Settings ***************************
      *************************************************************************/
     TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
     						globalGB);
-    domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+    domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
     connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
 
     domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
@@ -282,7 +282,7 @@ void KPluginOptions::scan()
         int ret = KMessageBox::warningYesNoCancel( this,
                                                     i18n("Do you want to apply your changes "
                                                          "before the scan? Otherwise the "
-                                                         "changes will be lost."), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
+                                                         "changes will be lost."), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
         if ( ret==KMessageBox::Cancel ) {
             m_widget->scanButton->setEnabled(true);
             return;
@@ -430,16 +430,16 @@ void KPluginOptions::dirSelect( TQListBoxItem *item )
     unsigned cur = m_widget->dirList->index(m_widget->dirList->selectedItem());
     m_widget->dirDown->setEnabled( item!=0 && cur<m_widget->dirList->count()-1 );
     m_widget->dirUp->setEnabled( item!=0 && cur>0 );
-    m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString::null );
+    m_widget->dirEdit->setURL( item!=0 ? item->text() : TQString() );
  }
 
 
 void KPluginOptions::dirNew()
 {
-    m_widget->dirList->insertItem( TQString::null, 0 );
+    m_widget->dirList->insertItem( TQString(), 0 );
     m_widget->dirList->setCurrentItem( 0 );
     dirSelect( m_widget->dirList->selectedItem() );
-    m_widget->dirEdit->setURL(TQString::null);
+    m_widget->dirEdit->setURL(TQString());
     m_widget->dirEdit->setFocus();
     change();
 }
@@ -447,7 +447,7 @@ void KPluginOptions::dirNew()
 
 void KPluginOptions::dirRemove()
 {
-    m_widget->dirEdit->setURL(TQString::null);
+    m_widget->dirEdit->setURL(TQString());
     delete m_widget->dirList->selectedItem();
     m_widget->dirRemove->setEnabled( false );
     m_widget->dirUp->setEnabled( false );