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, 58 insertions, 58 deletions

diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui
index 886724970..84fed5cfc 100644
--- a/kcontrol/componentchooser/browserconfig_ui.ui
+++ b/kcontrol/componentchooser/browserconfig_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>BrowserConfig_UI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>BrowserConfig_UI</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -41,7 +41,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>label</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <string>&lt;qt&gt;Open &lt;b&gt;http&lt;/b&gt; and &lt;b&gt;https&lt;/b&gt; URLs&lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioKIO</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioExec</cstring>
                     </property>
@@ -68,7 +68,7 @@
                         <string>in the following browser:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout3</cstring>
                     </property>
@@ -86,14 +86,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>lineExec</cstring>
                             </property>
@@ -101,7 +101,7 @@
                                 <bool>false</bool>
                             </property>
                         </widget>
-                        <widget class="QToolButton">
+                        <widget class="TQToolButton">
                             <property name="name">
                                 <cstring>btnSelectBrowser</cstring>
                             </property>
@@ -134,7 +134,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/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 88fdeb165..abe1e5c74 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -38,7 +38,7 @@
 #include <ktrader.h>
 #include <kurlrequester.h>
 
-class MyListBoxItem: public QListBoxText
+class MyListBoxItem: public TQListBoxText
 {
 public:
 	MyListBoxItem(const TQString& text, const TQString &file):TQListBoxText(text),File(file){}
@@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *)
 	kmailCB->setChecked(useKMail);
 	otherCB->setChecked(!useKMail);
 	txtEMailClient->setText(emailClient);
-	txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height());
+	txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height());
 	chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true"));
 
 	emit changed(false);
@@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient()
 	TQString client = dlg.text();
 
 	// get the preferred Terminal Application 
-	KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
-	TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
-	preferredTerminal += TQString::fromLatin1(" -e ");
+	KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+	TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
+	preferredTerminal += TQString::tqfromLatin1(" -e ");
 	
 	int len = preferredTerminal.length();
 	bool b = client.left(len) == preferredTerminal;
@@ -393,7 +393,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
 		ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
 
 	}
-	ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
+	ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width());
 	ServiceChooser->sort();
 	connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
 	ServiceChooser->setSelected(0,true);
@@ -410,14 +410,14 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
 
 	ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
-	ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
+	ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint());
 
 
 	TQString cfgType=cfg.readEntry("configurationType");
 	TQWidget *newConfigWidget = 0;
 	if (cfgType.isEmpty() || (cfgType=="component"))
 	{
-		if (!(configWidget && configWidget->qt_cast("CfgComponent")))
+		if (!(configWidget && configWidget->tqqt_cast("CfgComponent")))
 		{
 			CfgComponent* cfgcomp = new CfgComponent(configContainer);
                         cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text()));
@@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	}
 	else if (cfgType=="internal_email")
 	{
-		if (!(configWidget && configWidget->qt_cast("CfgEmailClient")))
+		if (!(configWidget && configWidget->tqqt_cast("CfgEmailClient")))
 		{
 			newConfigWidget = new CfgEmailClient(configContainer);
 		}
@@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	}
 	else if (cfgType=="internal_terminal")
 	{
-		if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator")))
+		if (!(configWidget && configWidget->tqqt_cast("CfgTerminalEmulator")))
 		{
 			newConfigWidget = new CfgTerminalEmulator(configContainer);
 		}
@@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	}
 	else if (cfgType=="internal_browser")
 	{
-		if (!(configWidget && configWidget->qt_cast("CfgBrowser")))
+		if (!(configWidget && configWidget->tqqt_cast("CfgBrowser")))
 		{
 			newConfigWidget = new CfgBrowser(configContainer);
 		}
@@ -461,11 +461,11 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 		delete configWidget;
 		configWidget=newConfigWidget;
 		connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
-	        configContainer->setMinimumSize(configWidget->sizeHint());
+	        configContainer->setMinimumSize(configWidget->tqsizeHint());
 	}
 	
 	if (configWidget)
-		static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->load(&cfg);
+		static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg);
 	
 	emitChanged(false);
 	latestEditedService=static_cast<MyListBoxItem*>(it)->File;
@@ -487,7 +487,7 @@ void ComponentChooser::load() {
 	if( configWidget )
 	{
 		CfgPlugin * plugin = static_cast<CfgPlugin*>(
-				configWidget->qt_cast( "CfgPlugin" ) );
+				configWidget->tqqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
 			KSimpleConfig cfg(latestEditedService);
@@ -500,7 +500,7 @@ void ComponentChooser::save() {
 	if( configWidget )
 	{
 		CfgPlugin * plugin = static_cast<CfgPlugin*>(
-				configWidget->qt_cast( "CfgPlugin" ) );
+				configWidget->tqqt_cast( "CfgPlugin" ) );
 		if( plugin )
 		{
 			KSimpleConfig cfg(latestEditedService);
@@ -512,7 +512,7 @@ void ComponentChooser::save() {
 void ComponentChooser::restoreDefault() {
     if (configWidget)
     {
-        static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->defaults();
+        static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->defaults();
         emitChanged(true);
     }
 
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index ed1ed7f7b..8af26fab9 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ComponentChooser_UI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ComponentChooser_UI</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox" row="1" column="1">
+        <widget class="TQGroupBox" row="1" column="1">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -52,14 +52,14 @@
                 <property name="margin">
                     <number>11</number>
                 </property>
-                <widget class="QWidgetStack">
+                <widget class="TQWidgetStack">
                     <property name="name">
                         <cstring>configContainer</cstring>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="0" column="1">
+        <widget class="TQGroupBox" row="0" column="1">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -84,14 +84,14 @@
                 <property name="margin">
                     <number>11</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>ComponentDescription</cstring>
                     </property>
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui
index d6a7bba87..a988335a9 100644
--- a/kcontrol/componentchooser/componentconfig_ui.ui
+++ b/kcontrol/componentchooser/componentconfig_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>ComponentConfig_UI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ComponentConfig_UI</cstring>
     </property>
@@ -19,14 +19,14 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>ChooserDocu</cstring>
             </property>
             <property name="text">
                 <string></string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>91</height>
diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui
index d4cb44085..2cae19a55 100644
--- a/kcontrol/componentchooser/emailclientconfig_ui.ui
+++ b/kcontrol/componentchooser/emailclientconfig_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EmailClientConfig_UI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EmailClientConfig_UI</cstring>
     </property>
@@ -30,7 +30,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>ButtonGroup2</cstring>
             </property>
@@ -50,7 +50,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLayoutWidget" row="2" column="1">
+                <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
                         <cstring>Layout4</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>txtEMailClient</cstring>
                             </property>
@@ -73,7 +73,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -86,7 +86,7 @@
                                 <string>Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; You can also use several placeholders which will be replaced with the actual values when the email client is called:&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
                             </property>
                         </widget>
-                        <widget class="QToolButton">
+                        <widget class="TQToolButton">
                             <property name="name">
                                 <cstring>btnSelectEmail</cstring>
                             </property>
@@ -102,7 +102,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox" row="3" column="1">
+                <widget class="TQCheckBox" row="3" column="1">
                     <property name="name">
                         <cstring>chkRunTerminal</cstring>
                     </property>
@@ -126,14 +126,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>16</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kmailCB</cstring>
                     </property>
@@ -144,7 +144,7 @@
                         <string>Kmail is the standard Mail program for the KDE desktop.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>otherCB</cstring>
                     </property>
@@ -165,7 +165,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>16</height>
@@ -182,7 +182,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>16</height>
diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
index 7d355fdd8..91d11f64b 100644
--- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
+++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>TerminalEmulatorConfig_UI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TerminalEmulatorConfig_UI</cstring>
     </property>
@@ -27,7 +27,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -57,14 +57,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>87</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>otherCB</cstring>
                     </property>
@@ -82,14 +82,14 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>terminalCB</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <string>&amp;Use Konsole as terminal application</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="2" column="1">
+                <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
                         <cstring>Layout4</cstring>
                     </property>
@@ -105,7 +105,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>terminalLE</cstring>
                             </property>
@@ -120,7 +120,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -130,7 +130,7 @@
                                 <string>Press this button to select your favorite terminal client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; Also note that some programs that utilize Terminal Emulator will not work if you add command line arguments (Example: konsole -ls).</string>
                             </property>
                         </widget>
-                        <widget class="QToolButton">
+                        <widget class="TQToolButton">
                             <property name="name">
                                 <cstring>btnSelectTerminal</cstring>
                             </property>