TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 47 insertions, 46 deletions

diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp
index 25e5239..a9ebb68 100644
--- a/kwallet/konfigurator/konfigurator.cpp
+++ b/kwallet/konfigurator/konfigurator.cpp
@@ -40,8 +40,8 @@
 typedef KGenericFactory<KWalletConfig, TQWidget> KWalletFactory;
 K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
 
-KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&)
-: KCModule(KWalletFactory::instance(), parent, name) {
+KWalletConfig::KWalletConfig(TQWidget *tqparent, const char *name, const TQStringList&)
+: KCModule(KWalletFactory::instance(), tqparent, name) {
 
 	KAboutData *about =
 		new KAboutData(I18N_NOOP("kcmkwallet"),
@@ -101,11 +101,11 @@ void KWalletConfig::updateWalletLists() {
 	_wcw->_localWallet->insertStringList(wl);
 	_wcw->_defaultWallet->insertStringList(wl);
 
-	if (wl.contains(p1)) {
+	if (wl.tqcontains(p1)) {
 		_wcw->_localWallet->setCurrentText(p1);
 	}
 
-	if (wl.contains(p2)) {
+	if (wl.tqcontains(p2)) {
 		_wcw->_defaultWallet->setCurrentText(p2);
 	}
 }
@@ -116,17 +116,17 @@ TQString KWalletConfig::newWallet() {
 
 	TQString n = KInputDialog::getText(i18n("New Wallet"),
 			i18n("Please choose a name for the new wallet:"),
-			TQString::null,
+			TQString(),
 			&ok,
 			this);
 
 	if (!ok) {
-		return TQString::null;
+		return TQString();
 	}
 
 	KWallet::Wallet *w = KWallet::Wallet::openWallet(n);
 	if (!w) {
-		return TQString::null;
+		return TQString();
 	}
 
 	delete w;
@@ -216,10 +216,10 @@ void KWalletConfig::load(bool useDefaults) {
 		denykeys.remove(*i);
 		TQListViewItem *lvi = new TQListViewItem(_wcw->_accessList, *i);
 		for (TQStringList::Iterator j = apps.begin(); j != apps.end(); ++j) {
-			new TQListViewItem(lvi, TQString::null, *j, i18n("Always Allow"));
+			new TQListViewItem(lvi, TQString(), *j, i18n("Always Allow"));
 		}
 		for (TQStringList::Iterator j = denyapps.begin(); j != denyapps.end(); ++j) {
-			new TQListViewItem(lvi, TQString::null, *j, i18n("Always Deny"));
+			new TQListViewItem(lvi, TQString(), *j, i18n("Always Deny"));
 		}
 	}
 	_cfg->setGroup("Auto Deny");
@@ -227,7 +227,7 @@ void KWalletConfig::load(bool useDefaults) {
 		TQStringList denyapps = _cfg->readListEntry(*i);
 		TQListViewItem *lvi = new TQListViewItem(_wcw->_accessList, *i);
 		for (TQStringList::Iterator j = denyapps.begin(); j != denyapps.end(); ++j) {
-			new TQListViewItem(lvi, TQString::null, *j, i18n("Always Deny"));
+			new TQListViewItem(lvi, TQString(), *j, i18n("Always Deny"));
 		}
 	}
 	emit changed(useDefaults);
@@ -302,9 +302,9 @@ TQString KWalletConfig::quickHelp() const {
 
 void KWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& pos, int col) {
 	Q_UNUSED(col)
-	if (item && item->parent()) {
+	if (item && item->tqparent()) {
 		KPopupMenu *m = new KPopupMenu(this);
-		m->insertTitle(item->parent()->text(0));
+		m->insertTitle(item->tqparent()->text(0));
 		m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete);
 		m->popup(pos);
 	}
diff --git a/kwallet/konfigurator/konfigurator.h b/kwallet/konfigurator/konfigurator.h
index 338e844..63ba608 100644
--- a/kwallet/konfigurator/konfigurator.h
+++ b/kwallet/konfigurator/konfigurator.h
@@ -28,8 +28,9 @@ class TQListViewItem;
 
 class KWalletConfig : public KCModule {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KWalletConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList& = TQStringList());
+		KWalletConfig(TQWidget *tqparent = 0L, const char *name = 0L, const TQStringList& = TQStringList());
 		virtual ~KWalletConfig();
 
 		void load();
diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui
index 797d569..0d1d1e9 100644
--- a/kwallet/konfigurator/walletconfigwidget.ui
+++ b/kwallet/konfigurator/walletconfigwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>WalletConfigWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WalletConfigWidget</cstring>
     </property>
@@ -19,11 +19,11 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQTabWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>tabWidget2</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -34,7 +34,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>_enabled</cstring>
                         </property>
@@ -48,7 +48,7 @@
                             <string>&lt;p&gt;The wallet subsytem allows a convenient and secure way to manage all your passwords. You can decide if you want to use this system with this option.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox2</cstring>
                         </property>
@@ -62,15 +62,15 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout1</cstring>
+                                    <cstring>tqlayout1</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>_closeIdle</cstring>
                                         </property>
@@ -89,7 +89,7 @@
                                             <string>&lt;p&gt;&lt;b&gt;Close wallet after a period of inactivity&lt;/b&gt;&lt;br&gt;When a wallet is closed the password is needed to access it again.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QSpinBox">
+                                    <widget class="TQSpinBox">
                                         <property name="name">
                                             <cstring>_idleTime</cstring>
                                         </property>
@@ -133,7 +133,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -142,7 +142,7 @@
                                     </spacer>
                                 </hbox>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>_screensaverLock</cstring>
                                 </property>
@@ -153,7 +153,7 @@
                                     <string>&lt;p&gt;&lt;b&gt;Close wallet as soon as the screensaver starts.&lt;/b&gt;&lt;br&gt;When a wallet is closed the password is needed to access it again.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>_autoclose</cstring>
                                 </property>
@@ -166,7 +166,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox4</cstring>
                         </property>
@@ -187,14 +187,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="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_2</cstring>
                                 </property>
@@ -202,7 +202,7 @@
                                     <string>Select wallet to use as default:</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0">
+                            <widget class="TQCheckBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>_localWalletSelected</cstring>
                                 </property>
@@ -210,7 +210,7 @@
                                     <string>Different wallet for local passwords:</string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="0" column="2">
+                            <widget class="TQComboBox" row="0" column="2">
                                 <property name="name">
                                     <cstring>_defaultWallet</cstring>
                                 </property>
@@ -223,7 +223,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="1" column="2">
+                            <widget class="TQComboBox" row="1" column="2">
                                 <property name="name">
                                     <cstring>_localWallet</cstring>
                                 </property>
@@ -239,7 +239,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="3">
+                            <widget class="TQPushButton" row="1" column="3">
                                 <property name="name">
                                     <cstring>_newLocalWallet</cstring>
                                 </property>
@@ -250,7 +250,7 @@
                                     <string>New...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="3">
+                            <widget class="TQPushButton" row="0" column="3">
                                 <property name="name">
                                     <cstring>_newWallet</cstring>
                                 </property>
@@ -260,7 +260,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox3</cstring>
                         </property>
@@ -281,14 +281,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="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>_launchManager</cstring>
                                 </property>
@@ -299,7 +299,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="1">
+                            <widget class="TQCheckBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>_autocloseManager</cstring>
                                 </property>
@@ -319,7 +319,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>31</width>
                                 <height>16</height>
@@ -328,7 +328,7 @@
                     </spacer>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -339,7 +339,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>_openPrompt</cstring>
                         </property>
@@ -350,7 +350,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QListView" row="1" column="0">
+                    <widget class="TQListView" row="1" column="0">
                         <column>
                             <property name="text">
                                 <string>Wallet</string>
@@ -397,7 +397,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>_launch</cstring>
             </property>
@@ -415,7 +415,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>369</width>
                     <height>21</height>
@@ -492,8 +492,8 @@
     <tabstop>_accessList</tabstop>
     <tabstop>_launch</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>_storeTogether_toggled(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>