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

16 files changed, 274 insertions, 267 deletions

diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp
index 917857c..17eecec 100644
--- a/kwallet/allyourbase.cpp
+++ b/kwallet/allyourbase.cpp
@@ -38,9 +38,9 @@
 /****************
  *  KWalletFolderItem - ListView items to represent kwallet folders
  */
-KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries)
-: KListViewItem(parent),_wallet(w),_name(name),_entries(entries) {
-	setText(0, TQString("%1 (%2)").arg(_name).arg(_entries));
+KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* tqparent, const TQString &name, int entries)
+: KListViewItem(tqparent),_wallet(w),_name(name),_entries(entries) {
+	setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_entries));
 	setRenameEnabled(0, false);
 	setDragEnabled(true);
 	setDropEnabled(true);
@@ -66,7 +66,7 @@ TQPixmap KWalletFolderItem::getFolderIcon(KIcon::Group group){
 void KWalletFolderItem::refresh() {
 	TQString saveFolder = _wallet->currentFolder();
 	_wallet->setFolder(_name);
-	setText(0, TQString("%1 (%2)").arg(_name).arg(_wallet->entryList().count()));
+	setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_wallet->entryList().count()));
 	_wallet->setFolder(saveFolder);
 }
 
@@ -83,7 +83,7 @@ KWalletContainerItem* KWalletFolderItem::getContainer(KWallet::Wallet::EntryType
 	return 0;
 }
 
-bool KWalletFolderItem::contains(const TQString& key) {
+bool KWalletFolderItem::tqcontains(const TQString& key) {
 	return (getItem(key) != 0);
 }
 
@@ -121,8 +121,8 @@ KWalletFolderItem::~KWalletFolderItem() {
  *  KWalletContainerItem - ListView items to represent kwallet containers, i.e.
  *  passwords, maps, ...
  */
-KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type)
-: KListViewItem(parent, name), _type(type) {
+KWalletContainerItem::KWalletContainerItem(TQListViewItem* tqparent, const TQString &name, KWallet::Wallet::EntryType type)
+: KListViewItem(tqparent, name), _type(type) {
 	setRenameEnabled(0, false);
 	setDragEnabled(true);
 }
@@ -138,7 +138,7 @@ KWallet::Wallet::EntryType KWalletContainerItem::type() {
 	return _type;
 }
 
-bool KWalletContainerItem::contains(const TQString& key) {
+bool KWalletContainerItem::tqcontains(const TQString& key) {
 	return getItem(key) != 0;
 }
 
@@ -154,8 +154,8 @@ TQListViewItem *KWalletContainerItem::getItem(const TQString& key) {
 /****************
  *  KWalletEntryItem - ListView items to represent kwallet entries
  */
-KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename)
-: KListViewItem(parent, ename), _wallet(w), _oldName(ename) {
+KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* tqparent, const TQString& ename)
+: KListViewItem(tqparent, ename), _wallet(w), _oldName(ename) {
 	setRenameEnabled(0, true);
 	setDragEnabled(true);
 }
@@ -170,8 +170,8 @@ KWalletEntryItem::~KWalletEntryItem() {
 /****************
  * KWalletItem - IconView items to represent wallets
  */
-KWalletItem::KWalletItem(TQIconView *parent, const TQString& walletName)
-: TQIconViewItem(parent, walletName, DesktopIcon("kwalletmanager")) {
+KWalletItem::KWalletItem(TQIconView *tqparent, const TQString& walletName)
+: TQIconViewItem(tqparent, walletName, DesktopIcon("kwalletmanager")) {
 }
 
 KWalletItem::~KWalletItem() {
@@ -183,7 +183,7 @@ bool KWalletItem::acceptDrop(const TQMimeSource *mime) const {
 }
 
 static bool decodeEntry(KWallet::Wallet *_wallet, TQDataStream& ds) {
-	Q_UINT32 magic;
+	TQ_UINT32 magic;
 	ds >> magic;
 	if (magic != KWALLETENTRYMAGIC) {
 		kdDebug() << "bad magic" << endl;
@@ -194,7 +194,7 @@ static bool decodeEntry(KWallet::Wallet *_wallet, TQDataStream& ds) {
 	KWallet::Wallet::EntryType et;
 	ds >> name;
 	if (_wallet->hasEntry(name)) {
-		int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").arg(name));
+		int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").tqarg(name));
 		if (rc == KMessageBox::Cancel) {
 			return false;
 		}
@@ -208,7 +208,7 @@ static bool decodeEntry(KWallet::Wallet *_wallet, TQDataStream& ds) {
 }
 
 static bool decodeFolder(KWallet::Wallet *_wallet, TQDataStream& ds) {
-	Q_UINT32 magic;
+	TQ_UINT32 magic;
 	ds >> magic;
 	if (magic != KWALLETFOLDERMAGIC) {
 		kdDebug() << "bad magic" << endl;
@@ -217,7 +217,7 @@ static bool decodeFolder(KWallet::Wallet *_wallet, TQDataStream& ds) {
 	TQString folder;
 	ds >> folder;
 	if (_wallet->hasFolder(folder)) {
-		int rc = KMessageBox::warningYesNoCancel(0L, i18n("A folder by the name '%1' already exists.  What would you like to do?").arg(folder), TQString::null, KStdGuiItem::cont(), i18n("Replace"));
+		int rc = KMessageBox::warningYesNoCancel(0L, i18n("A folder by the name '%1' already exists.  What would you like to do?").tqarg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace"));
 		if (rc == KMessageBox::Cancel) {
 			return false;
 		}
@@ -263,7 +263,7 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
 		TQDataStream *ds = 0L;
 
 		if (e->provides("application/x-kwallet-folder")) {
-			TQByteArray edata = e->encodedData("application/x-kwallet-folder");
+			TQByteArray edata = e->tqencodedData("application/x-kwallet-folder");
 			if (!edata.isEmpty()) {
 				ds = new TQDataStream(edata, IO_ReadOnly);
 			}
@@ -299,13 +299,13 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
 		delete _wallet;
 
 		//delete the folder from the source if we were moving
-		Qt::ButtonState state = kapp->keyboardMouseState();
-		if (e->source() && e->source()->parent() &&
-			!strcmp(e->source()->parent()->className(), "KWalletEntryList") &&
-			!(state & Qt::ControlButton)) {
+		TQt::ButtonState state = kapp->keyboardMouseState();
+		if (e->source() && e->source()->tqparent() &&
+			!strcmp(e->source()->tqparent()->className(), "KWalletEntryList") &&
+			!(state & TQt::ControlButton)) {
 		
 			KWalletEntryList *el =
-				dynamic_cast<KWalletEntryList*>(e->source()->parent());
+				dynamic_cast<KWalletEntryList*>(e->source()->tqparent());
 			if (el) {
 				KWalletFolderItem *fi = 
 					dynamic_cast<KWalletFolderItem*>(el->selectedItem());
@@ -348,8 +348,8 @@ class KWalletFolderDrag : public TQStoredDrag {
 /****************
  *  KWalletEntryList - A listview to store wallet entries
  */
-KWalletEntryList::KWalletEntryList(TQWidget *parent, const char *name)
-: KListView(parent, name) {
+KWalletEntryList::KWalletEntryList(TQWidget *tqparent, const char *name)
+: KListView(tqparent, name) {
 	addColumn(i18n("Folders"));
 	setRootIsDecorated(true);
 	setDefaultRenameAction(Reject);
@@ -389,10 +389,10 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 	TQListViewItem *sel = 0L;
 
 	//detect if we are dragging from kwallet itself
-	if (e->source() && e->source()->parent() &&
-		!strcmp(e->source()->parent()->className(), "KWalletEntryList")) {
+	if (e->source() && e->source()->tqparent() &&
+		!strcmp(e->source()->tqparent()->className(), "KWalletEntryList")) {
 
-		el = dynamic_cast<KWalletEntryList*>(e->source()->parent());
+		el = dynamic_cast<KWalletEntryList*>(e->source()->tqparent());
 		if (!el) {
 			KMessageBox::error(this, i18n("An unexpected error occurred trying to drop the item"));
 		} else
@@ -401,13 +401,13 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 
 	if (e->provides("application/x-kwallet-entry")) {
 		//do nothing if we are in the same folder
-		if (sel && sel->parent()->parent() == 
+		if (sel && sel->tqparent()->tqparent() == 
 				KWalletEntryList::getItemFolder(item)) {
 			e->ignore();
 			return;
 		}
 		isEntry = true;
-		TQByteArray data = e->encodedData("application/x-kwallet-entry");
+		TQByteArray data = e->tqencodedData("application/x-kwallet-entry");
 		if (data.isEmpty()) {
 			e->ignore();
 			return;
@@ -420,7 +420,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 			return;
 		}
 		isEntry = false;
-		TQByteArray data = e->encodedData("application/x-kwallet-folder");
+		TQByteArray data = e->tqencodedData("application/x-kwallet-folder");
 		if (data.isEmpty()) {
 			e->ignore();
 			return;
@@ -444,7 +444,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 			file.open(IO_ReadOnly);
 			ds = new TQDataStream(&file);
 			//check magic to discover mime type
-			Q_UINT32 magic;
+			TQ_UINT32 magic;
 			(*ds) >> magic;
 			if (magic == KWALLETENTRYMAGIC) {
 				isEntry = true;
@@ -468,7 +468,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 		e->ignore();
 		return;
 	}
-	Qt::ButtonState state = kapp->keyboardMouseState();
+	TQt::ButtonState state = kapp->keyboardMouseState();
 	if (isEntry) {
 		if (!item) {
 			e->ignore();
@@ -489,7 +489,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 		delete(ds);
 		//delete source if we were moving, i.e., we are dragging
 		//from kwalletmanager and Control is not pressed
-		if (ok && el && !(state & Qt::ControlButton) && sel) {
+		if (ok && el && !(state & TQt::ControlButton) && sel) {
 			el->_wallet->removeEntry(sel->text(0));
 			delete sel;
 		}
@@ -499,7 +499,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 		delete ds;
 		//delete source if we were moving, i.e., we are dragging
 		//from kwalletmanager and Control is not pressed
-		if (ok && el && !(state & Qt::ControlButton) && sel) {
+		if (ok && el && !(state & TQt::ControlButton) && sel) {
 			KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(sel);
 			if (fi) {
 				el->_wallet->removeFolder(fi->name());
@@ -562,9 +562,9 @@ KWalletFolderItem *KWalletEntryList::getItemFolder(TQListViewItem *item) {
 		case KWalletFolderItemClass:
 			return dynamic_cast<KWalletFolderItem *>(item);
 		case KWalletContainerItemClass:
-			return dynamic_cast<KWalletFolderItem *>(item->parent());
+			return dynamic_cast<KWalletFolderItem *>(item->tqparent());
 		case KWalletEntryItemClass:
-			return dynamic_cast<KWalletFolderItem *>(item->parent()->parent());
+			return dynamic_cast<KWalletFolderItem *>(item->tqparent()->tqparent());
 	}
 	return 0;
 }
@@ -589,11 +589,11 @@ class KWalletIconDrag : public TQIconDrag {
 			return 0L;
 		}
 
-		TQByteArray encodedData(const char *mime) const {
+		TQByteArray tqencodedData(const char *mime) const {
 			TQByteArray a;
 			TQCString mimetype(mime);
 			if (mimetype == "application/x-qiconlist") {
-				return TQIconDrag::encodedData(mime);
+				return TQIconDrag::tqencodedData(mime);
 			} else if (mimetype == "text/uri-list") {
 				TQCString s = _urls.join("\r\n").latin1();
 				if (_urls.count() > 0) {
@@ -618,8 +618,8 @@ class KWalletIconDrag : public TQIconDrag {
 /****************
 *  *  KWalletIconView - An iconview to store wallets
 *   */
-KWalletIconView::KWalletIconView(TQWidget *parent, const char *name)
-: KIconView(parent, name) {
+KWalletIconView::KWalletIconView(TQWidget *tqparent, const char *name)
+: KIconView(tqparent, name) {
 	KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
 	connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
 }
@@ -638,7 +638,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
 		return;
 	}
 
-	TQByteArray edata = e->encodedData("text/uri-list");
+	TQByteArray edata = e->tqencodedData("text/uri-list");
 	TQCString urls = edata.data();
 
 	TQStringList ul = TQStringList::split("\r\n", urls);
@@ -668,7 +668,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
 
 void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) {
 	_mousePos = e->pos();
-	if (!findItem(_mousePos)) {
+	if (!tqfindItem(_mousePos)) {
 		clearSelection();
 	}
 	KIconView::contentsMousePressEvent( e );
diff --git a/kwallet/allyourbase.h b/kwallet/allyourbase.h
index 299a6c9..7c37c10 100644
--- a/kwallet/allyourbase.h
+++ b/kwallet/allyourbase.h
@@ -27,8 +27,8 @@
 #include <kiconloader.h>
 #include <kicontheme.h>
 
-#define KWALLETENTRYMAGIC ((Q_UINT32) 0x6B776C65)
-#define KWALLETFOLDERMAGIC ((Q_UINT32) 0x6B776C66)
+#define KWALLETENTRYMAGIC ((TQ_UINT32) 0x6B776C65)
+#define KWALLETFOLDERMAGIC ((TQ_UINT32) 0x6B776C66)
 
 enum KWalletListItemClasses {
 	KWalletFolderItemClass = 1000,
@@ -39,7 +39,7 @@ enum KWalletListItemClasses {
 
 class KWalletEntryItem : public KListViewItem {
 	public:
-		KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename);
+		KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* tqparent, const TQString& ename);
 		virtual ~KWalletEntryItem();
 
 		const TQString& oldName() { return _oldName; }
@@ -57,14 +57,14 @@ class KWalletEntryItem : public KListViewItem {
 
 class KWalletContainerItem : public KListViewItem {
 	public:
-		KWalletContainerItem(TQListViewItem* parent, const TQString& name,
+		KWalletContainerItem(TQListViewItem* tqparent, const TQString& name,
 		    KWallet::Wallet::EntryType type);
 		virtual ~KWalletContainerItem();
 
 	public:
 		virtual int rtti() const;
 		KWallet::Wallet::EntryType type();
-		bool contains(const TQString& itemKey);
+		bool tqcontains(const TQString& itemKey);
 		TQListViewItem* getItem(const TQString& itemKey);
 
 	private:
@@ -73,7 +73,7 @@ class KWalletContainerItem : public KListViewItem {
 
 class KWalletFolderItem : public KListViewItem {
 	public:
-		KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, 
+		KWalletFolderItem(KWallet::Wallet *w, TQListView* tqparent, 
 			const TQString& name, int entries);
 		virtual ~KWalletFolderItem();
 
@@ -84,7 +84,7 @@ class KWalletFolderItem : public KListViewItem {
 		void refresh();
 		KWalletContainerItem* getContainer(KWallet::Wallet::EntryType type);
 		TQPixmap getFolderIcon(KIcon::Group group);
-		bool contains(const TQString& itemKey);
+		bool tqcontains(const TQString& itemKey);
 		TQListViewItem* getItem(const TQString& itemKey);
 
 	public:
@@ -97,8 +97,9 @@ class KWalletFolderItem : public KListViewItem {
 
 class KWalletEntryList : public KListView {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KWalletEntryList(TQWidget *parent, const char *name = 0L);
+		KWalletEntryList(TQWidget *tqparent, const char *name = 0L);
 		virtual ~KWalletEntryList();
 
 		bool existsFolder(const TQString& name);
@@ -121,7 +122,7 @@ class KWalletEntryList : public KListView {
 
 class KWalletItem : public TQIconViewItem {
 	public:
-		KWalletItem(TQIconView *parent, const TQString& walletName);
+		KWalletItem(TQIconView *tqparent, const TQString& walletName);
 		virtual ~KWalletItem();
 
 		virtual bool acceptDrop(const TQMimeSource *mime) const;
@@ -133,8 +134,9 @@ class KWalletItem : public TQIconViewItem {
 
 class KWalletIconView : public KIconView {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KWalletIconView(TQWidget *parent, const char *name = 0L);
+		KWalletIconView(TQWidget *tqparent, const char *name = 0L);
 		virtual ~KWalletIconView();
 
 	protected slots:
diff --git a/kwallet/kbetterthankdialogbase.ui b/kwallet/kbetterthankdialogbase.ui
index 30d2d93..16d3514 100644
--- a/kwallet/kbetterthankdialogbase.ui
+++ b/kwallet/kbetterthankdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KBetterThanKDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>KBetterThanKDialogBase</cstring>
     </property>
@@ -37,22 +37,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_allowOnce</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_allowAlways</cstring>
                     </property>
@@ -71,7 +71,7 @@
                         <string>Replace &amp;All</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_deny</cstring>
                     </property>
@@ -79,7 +79,7 @@
                         <string>&amp;Skip</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_denyForever</cstring>
                     </property>
@@ -99,7 +99,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>21</height>
@@ -140,14 +140,14 @@
     <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="private">clicked()</slot>
-    <slot>setLabel( const QString &amp; label )</slot>
+    <slot>setLabel( const TQString &amp; label )</slot>
     <slot access="private">init()</slot>
     <slot access="protected">accept()</slot>
     <slot access="protected">reject()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
 </includehints>
diff --git a/kwallet/kbetterthankdialogbase.ui.h b/kwallet/kbetterthankdialogbase.ui.h
index 4d32a14..e97ffd1 100644
--- a/kwallet/kbetterthankdialogbase.ui.h
+++ b/kwallet/kbetterthankdialogbase.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you want to add, delete, or rename functions or slots, use
-** Qt Designer to update this file, preserving your code.
+** TQt Designer to update this file, preserving your code.
 **
 ** You should not define a constructor or destructor in this file.
 ** Instead, write your code in functions called init() and destroy().
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>
diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp
index adaec87..2a72870 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/kwallet/kwalleteditor.cpp
@@ -62,11 +62,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
-KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent, const char *name)
-: KMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) {
+KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *tqparent, const char *name)
+: KMainWindow(tqparent, name), _walletName(wallet), _nonLocal(isPath) {
 	_newWallet = false;
 	_ww = new WalletWidget(this, "Wallet Widget");
-	_copyPassAction = KStdAction::copy(this, TQT_SLOT(copyPassword()), actionCollection());
+	_copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection());
 
 	TQVBoxLayout *box = new TQVBoxLayout(_ww->_entryListFrame);
 	box->setSpacing( KDialog::spacingHint() );
@@ -133,7 +133,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare
 
 	setCaption(wallet);
 
-	TQTimer::singleShot(0, this, TQT_SLOT(layout()));
+	TQTimer::singleShot(0, this, TQT_SLOT(tqlayout()));
 }
 
 KWalletEditor::~KWalletEditor() {
@@ -149,7 +149,7 @@ KWalletEditor::~KWalletEditor() {
 	}
 }
 
-void KWalletEditor::layout() {
+void KWalletEditor::tqlayout() {
 	TQValueList<int> sz = _ww->_splitter->sizes();
 	int sum = sz[0] + sz[1];
 	sz[0] = sum/2;
@@ -159,48 +159,48 @@ void KWalletEditor::layout() {
 
 void KWalletEditor::createActions() {
 	_newFolderAction = new KAction(i18n("&New Folder..."), "folder_new",
-			0, this, TQT_SLOT(createFolder()), actionCollection(),
+			0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(),
 			"create_folder");
 	connect(this, TQT_SIGNAL(enableFolderActions(bool)),
 		_newFolderAction, TQT_SLOT(setEnabled(bool)));
 
 	_deleteFolderAction = new KAction(i18n("&Delete Folder"), 0, 0,
-			this, TQT_SLOT(deleteFolder()), actionCollection(),
+			TQT_TQOBJECT(this), TQT_SLOT(deleteFolder()), actionCollection(),
 			"delete_folder");
 	connect(this, TQT_SIGNAL(enableContextFolderActions(bool)),
 		_deleteFolderAction, TQT_SLOT(setEnabled(bool)));
 	connect(this, TQT_SIGNAL(enableFolderActions(bool)),
 		_deleteFolderAction, TQT_SLOT(setEnabled(bool)));
 
-	_passwordAction = new KAction(i18n("Change &Password..."), 0, 0, this,
+	_passwordAction = new KAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this),
 			TQT_SLOT(changePassword()), actionCollection(),
 			"change_password");
 	connect(this, TQT_SIGNAL(enableWalletActions(bool)),
 		_passwordAction, TQT_SLOT(setEnabled(bool)));
 
-	_mergeAction = new KAction(i18n("&Merge Wallet..."), 0, 0, this,
+	_mergeAction = new KAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this),
 			TQT_SLOT(importWallet()), actionCollection(),
 			"merge");
 	connect(this, TQT_SIGNAL(enableWalletActions(bool)),
 		_mergeAction, TQT_SLOT(setEnabled(bool)));
 
-	_importAction = new KAction(i18n("&Import XML..."), 0, 0, this,
+	_importAction = new KAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this),
 			TQT_SLOT(importXML()), actionCollection(),
 			"import");
 	connect(this, TQT_SIGNAL(enableWalletActions(bool)),
 		_importAction, TQT_SLOT(setEnabled(bool)));
 
-	_exportAction = new KAction(i18n("&Export..."), 0, 0, this,
+	_exportAction = new KAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this),
 			TQT_SLOT(exportXML()), actionCollection(),
 			"export");
 	connect(this, TQT_SIGNAL(enableWalletActions(bool)),
 		_exportAction, TQT_SLOT(setEnabled(bool)));
 
-	_saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
+	_saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
 	connect(this, TQT_SIGNAL(enableWalletActions(bool)),
 		_saveAsAction, TQT_SLOT(setEnabled(bool)));
 
-	KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 	KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
 	emit enableWalletActions(false);
@@ -230,7 +230,7 @@ void KWalletEditor::updateFolderList(bool checkEntries) {
 		if (!fi) {
 			continue;
 		}
-		if (!fl.contains(fi->name())) {
+		if (!fl.tqcontains(fi->name())) {
 			trash.push(i);
 		}
 	}
@@ -277,7 +277,7 @@ void KWalletEditor::updateFolderList(bool checkEntries) {
 	}
 
 	//check if the current folder has been removed
-	if (!fl.contains(_currentFolder)) {
+	if (!fl.tqcontains(_currentFolder)) {
 		_currentFolder = "";
 		_ww->_entryTitle->clear();
 		_ww->_iconTitle->clear();
@@ -293,7 +293,7 @@ void KWalletEditor::deleteFolder() {
 				return;
 			}
 
-			int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the folder '%1' from the wallet?").arg(fi->name()),"",KStdGuiItem::del());
+			int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the folder '%1' from the wallet?").tqarg(fi->name()),"",KStdGuiItem::del());
 			if (rc == KMessageBox::Continue) {
 				bool rc = _w->removeFolder(fi->name());
 				if (!rc) {
@@ -318,7 +318,7 @@ void KWalletEditor::createFolder() {
 		do {
 			n = KInputDialog::getText(i18n("New Folder"),
 					i18n("Please choose a name for the new folder:"),
-					TQString::null,
+					TQString(),
 					&ok,
 					this);
 
@@ -327,11 +327,11 @@ void KWalletEditor::createFolder() {
 			}
 
 			if (_entryList->existsFolder(n)) {
-				int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that folder name is in use. Try again?"), TQString::null, i18n("Try Again"), i18n("Do Not Try"));
+				int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that folder name is in use. Try again?"), TQString(), i18n("Try Again"), i18n("Do Not Try"));
 				if (rc == KMessageBox::Yes) {
 					continue;
 				}
-				n = TQString::null;
+				n = TQString();
 			}
 			break;
 		} while (true);
@@ -348,8 +348,8 @@ void KWalletEditor::saveEntry() {
 	_ww->_saveChanges->setEnabled(false);
 	_ww->_undoChanges->setEnabled(false);
 
-	if (item && _w && item->parent()) {
-		KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->parent());
+	if (item && _w && item->tqparent()) {
+		KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->tqparent());
 		if (ci) {
 			if (ci->type() == KWallet::Wallet::Password) {
 				rc = _w->writePassword(item->text(0), _ww->_passwordValue->text());
@@ -366,7 +366,7 @@ void KWalletEditor::saveEntry() {
 		}
 	}
 
-	KMessageBox::sorry(this, i18n("Error saving entry. Error code: %1").arg(rc));
+	KMessageBox::sorry(this, i18n("Error saving entry. Error code: %1").tqarg(rc));
 }
 
 
@@ -387,11 +387,11 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 
 	switch (item->rtti()) {
 		case KWalletEntryItemClass:
-			ci = dynamic_cast<KWalletContainerItem*>(item->parent());
+			ci = dynamic_cast<KWalletContainerItem*>(item->tqparent());
 			if (!ci) {
 				return;
 			}
-			fi = dynamic_cast<KWalletFolderItem*>(ci->parent());
+			fi = dynamic_cast<KWalletFolderItem*>(ci->tqparent());
 			if (!fi) {
 				return;
 			}
@@ -402,7 +402,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 				if (_w->readPassword(item->text(0), pass) == 0) {
 					_ww->_entryStack->raiseWidget(int(4));
 					_ww->_entryName->setText(i18n("Password: %1")
-							.arg(item->text(0)));
+							.tqarg(item->text(0)));
 					_ww->_passwordValue->setText(pass);
 					_ww->_saveChanges->setEnabled(false);
 					_ww->_undoChanges->setEnabled(false);
@@ -413,7 +413,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 				showHideMapEditorValue(false);
 				if (_w->readMap(item->text(0), _currentMap) == 0) {
 					_mapEditor->reload();
-					_ww->_entryName->setText(i18n("Name-Value Map: %1").arg(item->text(0)));
+					_ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(item->text(0)));
 					_ww->_saveChanges->setEnabled(false);
 					_ww->_undoChanges->setEnabled(false);
 				}
@@ -422,7 +422,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 				TQByteArray ba;
 				if (_w->readEntry(item->text(0), ba) == 0) {
 					_ww->_entryName->setText(i18n("Binary Data: %1")
-							.arg(item->text(0)));
+							.tqarg(item->text(0)));
 					_ww->_saveChanges->setEnabled(false);
 					_ww->_undoChanges->setEnabled(false);
 				}
@@ -430,7 +430,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 			break;
 
 		case KWalletContainerItemClass:
-			fi = dynamic_cast<KWalletFolderItem*>(item->parent());
+			fi = dynamic_cast<KWalletFolderItem*>(item->tqparent());
 			if (!fi) {
 				return;
 			}
@@ -454,7 +454,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 
 	if (fi) {
 		_currentFolder = fi->name();
-		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
+		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
 		_ww->_iconTitle->setPixmap(fi->getFolderIcon(KIcon::Toolbar));
 	}
 }
@@ -478,7 +478,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 
 	// Remove deleted entries
 	for (TQListViewItem *i = pi->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.contains(i->text(0))) {
+		if (!entries.tqcontains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -487,7 +487,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 	}
 
 	for (TQListViewItem *i = mi->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.contains(i->text(0))) {
+		if (!entries.tqcontains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -496,7 +496,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 	}
 
 	for (TQListViewItem *i = bi->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.contains(i->text(0))) {
+		if (!entries.tqcontains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -505,7 +505,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 	}
 
 	for (TQListViewItem *i = ui->firstChild(); i; i = i->nextSibling()) {
-		if (!entries.contains(i->text(0))) {
+		if (!entries.tqcontains(i->text(0))) {
 			if (i == _entryList->currentItem()) {
 				entrySelectionChanged(0L);
 			}
@@ -518,7 +518,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 
 	// Add new entries
 	for (TQStringList::Iterator i = entries.begin(); i != entries.end(); ++i) {
-		if (fi->contains(*i)){
+		if (fi->tqcontains(*i)){
 			continue;
 		}
 
@@ -540,7 +540,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
 	}
 	fi->refresh();
 	if (fi->name() == _currentFolder) {
-		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
+		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
 	}
 	if (!_entryList->selectedItem()) {
 		_ww->_entryName->clear();
@@ -560,7 +560,7 @@ void KWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoint
 
 	if (item) {
 		if (item->rtti() == KWalletEntryItemClass) {
-			ci = dynamic_cast<KWalletContainerItem *>(item->parent());
+			ci = dynamic_cast<KWalletContainerItem *>(item->tqparent());
 			if (!ci) {
 				return;
 			}
@@ -617,7 +617,7 @@ void KWalletEditor::copyPassword() {
 	if (_w && item) {
 		TQString pass;
 		if (_w->readPassword(item->text(0), pass) == 0) {
-			TQApplication::clipboard()->setText(pass);
+			TQApplication::tqclipboard()->setText(pass);
 		}
 	}
 }
@@ -635,9 +635,9 @@ void KWalletEditor::newEntry() {
 	if (_w && item) {
 		p = item;
 		if (p->rtti() == KWalletEntryItemClass) {
-			p = item->parent();
+			p = item->tqparent();
 		}
-		fi = dynamic_cast<KWalletFolderItem *>(p->parent());
+		fi = dynamic_cast<KWalletFolderItem *>(p->tqparent());
 		if (!fi) {
 			return;
 		}
@@ -649,7 +649,7 @@ void KWalletEditor::newEntry() {
 	do {
 		n = KInputDialog::getText(i18n("New Entry"),
 				i18n("Please choose a name for the new entry:"),
-				TQString::null,
+				TQString(),
 				&ok,
 				this);
 
@@ -658,12 +658,12 @@ void KWalletEditor::newEntry() {
 		}
 
 		// FIXME: prohibits the use of the subheadings
-		if (fi->contains(n)) {
-			int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that entry already exists. Try again?"), TQString::null, i18n("Try Again"), i18n("Do Not Try"));
+		if (fi->tqcontains(n)) {
+			int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that entry already exists. Try again?"), TQString(), i18n("Try Again"), i18n("Do Not Try"));
 			if (rc == KMessageBox::Yes) {
 				continue;
 			}
-			n = TQString::null;
+			n = TQString();
 		}
 		break;
 	} while (true);
@@ -671,10 +671,10 @@ void KWalletEditor::newEntry() {
 	if (_w && item && !n.isEmpty()) {
 		TQListViewItem *p = item;
 		if (p->rtti() == KWalletEntryItemClass) {
-			p = item->parent();
+			p = item->tqparent();
 		}
 
-		KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(p->parent());
+		KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(p->tqparent());
 		if (!fi) {
 			KMessageBox::error(this, i18n("An unexpected error occurred trying to add the new entry"));
 			return;
@@ -691,7 +691,7 @@ void KWalletEditor::newEntry() {
 			return;
 		}
 		if (ci->type() == KWallet::Wallet::Password) {
-			_w->writePassword(n, TQString::null);
+			_w->writePassword(n, TQString());
 		} else if (ci->type() == KWallet::Wallet::Map) {
 			_w->writeMap(n, TQMap<TQString,TQString>());
 		} else if (ci->type() == KWallet::Wallet::Stream) {
@@ -700,7 +700,7 @@ void KWalletEditor::newEntry() {
 			abort();
 		}
 		fi->refresh();
-		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
+		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
 	}
 }
 
@@ -728,17 +728,17 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t
 
 		if (_w->renameEntry(i->oldName(), t) == 0) {
 			i->clearOldName();
-			KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->parent());
+			KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->tqparent());
 			if (!ci) {
 				KMessageBox::error(this, i18n("An unexpected error occurred trying to rename the entry"));
 				return;
 			}
 			if (ci->type() == KWallet::Wallet::Password) {
-				_ww->_entryName->setText(i18n("Password: %1").arg(item->text(0)));
+				_ww->_entryName->setText(i18n("Password: %1").tqarg(item->text(0)));
 			} else if (ci->type() == KWallet::Wallet::Map) {
-				_ww->_entryName->setText(i18n("Name-Value Map: %1").arg(item->text(0)));
+				_ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(item->text(0)));
 			} else if (ci->type() == KWallet::Wallet::Stream) {
-				_ww->_entryName->setText(i18n("Binary Data: %1").arg(item->text(0)));
+				_ww->_entryName->setText(i18n("Binary Data: %1").tqarg(item->text(0)));
 			}
 		} else {
 			i->setText(0, i->oldName());
@@ -750,9 +750,9 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t
 void KWalletEditor::deleteEntry() {
 	TQListViewItem *item = _entryList->selectedItem();
 	if (_w && item) {
-		int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").arg(item->text(0)),"",KStdGuiItem::del());
+		int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").tqarg(item->text(0)),"",KStdGuiItem::del());
 		if (rc == KMessageBox::Continue) {
-			KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(item->parent()->parent());
+			KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(item->tqparent()->tqparent());
 			if (!fi) {
 				KMessageBox::error(this, i18n("An unexpected error occurred trying to delete the entry"));
 				return;
@@ -761,7 +761,7 @@ void KWalletEditor::deleteEntry() {
 			delete item;
 			entrySelectionChanged(_entryList->currentItem());
 			fi->refresh();
-			_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
+			_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
 		}
 	}
 }
@@ -811,14 +811,14 @@ void KWalletEditor::showHideMapEditorValue(bool show) {
 enum MergePlan { Prompt = 0, Always = 1, Never = 2, Yes = 3, No = 4 };
 
 void KWalletEditor::importWallet() {
-	KURL url = KFileDialog::getOpenURL(TQString::null, "*.kwl", this);
+	KURL url = KFileDialog::getOpenURL(TQString(), "*.kwl", this);
 	if (url.isEmpty()) {
 		return;
 	}
 
 	TQString tmpFile;
 	if (!KIO::NetAccess::download(url, tmpFile, this)) {
-		KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.").arg(url.prettyURL()));
+		KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.").tqarg(url.prettyURL()));
 		return;
 	}
 
@@ -847,7 +847,7 @@ void KWalletEditor::importWallet() {
 					if (hasEntry && mp == Prompt) {
 						KBetterThanKDialogBase *bd;
 						bd = new KBetterThanKDialogBase(this);
-						bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(me.key())));
+						bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(me.key())));
 						mp = (MergePlan)bd->exec();
 						delete bd;
 						bool ok = false;
@@ -877,7 +877,7 @@ void KWalletEditor::importWallet() {
 					if (hasEntry && mp == Prompt) {
 						KBetterThanKDialogBase *bd;
 						bd = new KBetterThanKDialogBase(this);
-						bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(pe.key())));
+						bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(pe.key())));
 						mp = (MergePlan)bd->exec();
 						delete bd;
 						bool ok = false;
@@ -907,7 +907,7 @@ void KWalletEditor::importWallet() {
 					if (hasEntry && mp == Prompt) {
 						KBetterThanKDialogBase *bd;
 						bd = new KBetterThanKDialogBase(this);
-						bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(ee.key())));
+						bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(ee.key())));
 						mp = (MergePlan)bd->exec();
 						delete bd;
 						bool ok = false;
@@ -939,27 +939,27 @@ void KWalletEditor::importWallet() {
 
 
 void KWalletEditor::importXML() {
-	KURL url = KFileDialog::getOpenURL(TQString::null, "*.xml", this);
+	KURL url = KFileDialog::getOpenURL(TQString(), "*.xml", this);
 	if (url.isEmpty()) {
 		return;
 	}
 
 	TQString tmpFile;
 	if (!KIO::NetAccess::download(url, tmpFile, this)) {
-		KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.").arg(url.prettyURL()));
+		KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.").tqarg(url.prettyURL()));
 		return;
 	}
 
 	TQFile qf(tmpFile);
 	if (!qf.open(IO_ReadOnly)) {
-		KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.").arg(url.prettyURL()));
+		KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.").tqarg(url.prettyURL()));
 		KIO::NetAccess::removeTempFile(tmpFile);
 		return;
 	}
 
 	TQDomDocument doc(tmpFile);
 	if (!doc.setContent(&qf)) {
-		KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.").arg(url.prettyURL()));
+		KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.").tqarg(url.prettyURL()));
 		KIO::NetAccess::removeTempFile(tmpFile);
 		return;
 	}
@@ -998,7 +998,7 @@ void KWalletEditor::importXML() {
 			if (hasEntry && mp == Prompt) {
 				KBetterThanKDialogBase *bd;
 				bd = new KBetterThanKDialogBase(this);
-				bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").arg(TQStyleSheet::escape(fname)).arg(TQStyleSheet::escape(ename)));
+				bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'.  Do you wish to replace it?").tqarg(TQStyleSheet::escape(fname)).tqarg(TQStyleSheet::escape(ename)));
 				mp = (MergePlan)bd->exec();
 				delete bd;
 				bool ok = false;
@@ -1020,7 +1020,7 @@ void KWalletEditor::importXML() {
 			if (type == "password") {
 				_w->writePassword(ename, e.text());
 			} else if (type == "stream") {
-				_w->writeEntry(ename, KCodecs::base64Decode(e.text().latin1()));
+				_w->writeEntry(ename, KCodecs::base64Decode(TQCString(e.text().latin1())));
 			} else if (type == "map") {
 				TQMap<TQString,TQString> map;
 				TQDomNode mapNode = e.firstChild();
@@ -1101,12 +1101,12 @@ void KWalletEditor::exportXML() {
 	ts << "</wallet>" << endl;
 	tf.close();
 
-	KURL url = KFileDialog::getSaveURL(TQString::null, "*.xml", this);
+	KURL url = KFileDialog::getSaveURL(TQString(), "*.xml", this);
 
 	if (!url.isEmpty()) {
 		bool ok = true;
 		if (KIO::NetAccess::exists(url, false, this)) {
-			int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").arg(url.prettyURL()), i18n("Overwrite"));
+			int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").tqarg(url.prettyURL()), i18n("Overwrite"));
 			if (rc == KMessageBox::Cancel) {
 				ok = false;
 			}
@@ -1125,7 +1125,7 @@ void KWalletEditor::setNewWallet(bool x) {
 
 
 void KWalletEditor::saveAs() {
-	KURL url = KFileDialog::getSaveURL(TQString::null, "*.kwl", this);
+	KURL url = KFileDialog::getSaveURL(TQString(), "*.kwl", this);
 	if (!url.isEmpty()) {
 		// Sync() kwalletd
 		if (_nonLocal) {
diff --git a/kwallet/kwalleteditor.h b/kwallet/kwalleteditor.h
index 9036bce..7d4fe86 100644
--- a/kwallet/kwalleteditor.h
+++ b/kwallet/kwalleteditor.h
@@ -36,9 +36,10 @@ class KWMapEditor;
 
 class KWalletEditor : public KMainWindow {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent = 0, const char* name = 0);
+		KWalletEditor(const TQString& wallet, bool isPath, TQWidget *tqparent = 0, const char* name = 0);
 		virtual ~KWalletEditor();
 
 		bool isOpen() const { return _w != 0L; }
@@ -51,7 +52,7 @@ class KWalletEditor : public KMainWindow {
 		void deleteFolder();
 
 	private slots:
-		void layout();
+		void tqlayout();
 		void updateFolderList(bool checkEntries = false);
 		void entrySelectionChanged(TQListViewItem *item);
 		void listItemRenamed(TQListViewItem *, int, const TQString&);
diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp
index 58c98aa..7ac86d2 100644
--- a/kwallet/kwalletmanager.cpp
+++ b/kwallet/kwalletmanager.cpp
@@ -46,8 +46,8 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
-: KMainWindow(parent, name, f), DCOPObject("KWalletManager") {
+KWalletManager::KWalletManager(TQWidget *tqparent, const char *name, WFlags f)
+: KMainWindow(tqparent, name, f), DCOPObject("KWalletManager") {
 	KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
 	_kwalletdLaunch = false;
 	TQAccel *accel = new TQAccel(this, "kwalletmanager");
@@ -84,8 +84,8 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 	}
 
 	_iconView = new KWalletIconView(this, "kwalletmanager icon view");
-	connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), this, TQT_SLOT(openWallet(TQIconViewItem*)));
-	connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
+	connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(TQIconViewItem*)));
+	connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
 
 	updateWalletDisplay();
 	setCentralWidget(_iconView);
@@ -112,28 +112,28 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 	//        wallet closes before we are done opening.  We will then stay
 	//        open.  Must check that a wallet is still open here.
 
-	new KAction(i18n("&New Wallet..."), "kwalletmanager", 0, this,
+	new KAction(i18n("&New Wallet..."), "kwalletmanager", 0, TQT_TQOBJECT(this),
 			TQT_SLOT(createWallet()), actionCollection(),
 			"wallet_create");
 	KAction *act = new KAction(i18n("Configure &Wallet..."), "configure",
-			0, this, TQT_SLOT(setupWallet()), actionCollection(),
+			0, TQT_TQOBJECT(this), TQT_SLOT(setupWallet()), actionCollection(),
 			"wallet_settings");
 	if (_tray) {
 		act->plug(_tray->contextMenu());
 	}
-	act = new KAction(i18n("Close &All Wallets"), 0, 0, this,
+	act = new KAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this),
 			TQT_SLOT(closeAllWallets()), actionCollection(),
 			"close_all_wallets");
 	if (_tray) {
 		act->plug(_tray->contextMenu());
 	}
-	KStdAction::quit(this, TQT_SLOT(shuttingDown()), actionCollection());
+	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(shuttingDown()), actionCollection());
 	KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
 
 	createGUI("kwalletmanager.rc");
-	accel->connectItem(accel->insertItem(Key_Return), this, TQT_SLOT(openWallet()));
-	accel->connectItem(accel->insertItem(Key_Delete), this, TQT_SLOT(deleteWallet()));
+	accel->connectItem(accel->insertItem(Key_Return), TQT_TQOBJECT(this), TQT_SLOT(openWallet()));
+	accel->connectItem(accel->insertItem(Key_Delete), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet()));
 
 	if (_tray) {
 		_tray->show();
@@ -185,7 +185,7 @@ TQStringList wl = KWallet::Wallet::walletList();
 TQPtrStack<TQIconViewItem> trash;
 
 	for (TQIconViewItem *item = _iconView->firstItem(); item; item = item->nextItem()) {
-		if (!wl.contains(item->text())) {
+		if (!wl.tqcontains(item->text())) {
 			trash.push(item);
 		}
 	}
@@ -194,7 +194,7 @@ TQPtrStack<TQIconViewItem> trash;
 	trash.clear();
 
 	for (TQStringList::Iterator i = wl.begin(); i != wl.end(); ++i) {
-		if (!_iconView->findItem(*i)) {
+		if (!_iconView->tqfindItem(*i)) {
 			// FIXME: if KWallet::Wallet::isOpen(*i) then show
 			//        a different icon!
 			new KWalletItem(_iconView, *i);
@@ -208,11 +208,11 @@ TQPtrStack<TQIconViewItem> trash;
 void KWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) {
 	if (item) {
 		TQGuardedPtr<KWalletPopup> popupMenu = new KWalletPopup(item->text(), this);
-		connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), this, TQT_SLOT(openWallet(const TQString&)));
-		connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), this, TQT_SLOT(closeWallet(const TQString&)));
-		connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), this, TQT_SLOT(deleteWallet(const TQString&)));
-		connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), this, TQT_SLOT(changeWalletPassword(const TQString&)));
-		connect(popupMenu, TQT_SIGNAL(walletCreated()), this, TQT_SLOT(createWallet()));
+		connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(const TQString&)));
+		connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(closeWallet(const TQString&)));
+		connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet(const TQString&)));
+		connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(changeWalletPassword(const TQString&)));
+		connect(popupMenu, TQT_SIGNAL(walletCreated()), TQT_TQOBJECT(this), TQT_SLOT(createWallet()));
 		popupMenu->exec(pos);
 		delete popupMenu;
 	}
@@ -220,13 +220,13 @@ void KWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) {
 
 
 void KWalletManager::deleteWallet(const TQString& walletName) {
-	int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the wallet '%1'?").arg(walletName),"",KStdGuiItem::del());
+	int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the wallet '%1'?").tqarg(walletName),"",KStdGuiItem::del());
 	if (rc != KMessageBox::Continue) {
 		return;
 	}
 	rc = KWallet::Wallet::deleteWallet(walletName);
 	if (rc != 0) {
-		KMessageBox::sorry(this, i18n("Unable to delete the wallet. Error code was %1.").arg(rc));
+		KMessageBox::sorry(this, i18n("Unable to delete the wallet. Error code was %1.").tqarg(rc));
 	}
 	updateWalletDisplay();
 }
@@ -235,11 +235,11 @@ void KWalletManager::deleteWallet(const TQString& walletName) {
 void KWalletManager::closeWallet(const TQString& walletName) {
 	int rc = KWallet::Wallet::closeWallet(walletName, false);
 	if (rc != 0) {
-		rc = KMessageBox::warningYesNo(this, i18n("Unable to close wallet cleanly. It is probably in use by other applications. Do you wish to force it closed?"), TQString::null, i18n("Force Closure"), i18n("Do Not Force"));
+		rc = KMessageBox::warningYesNo(this, i18n("Unable to close wallet cleanly. It is probably in use by other applications. Do you wish to force it closed?"), TQString(), i18n("Force Closure"), i18n("Do Not Force"));
 		if (rc == KMessageBox::Yes) {
 			rc = KWallet::Wallet::closeWallet(walletName, true);
 			if (rc != 0) {
-				KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code was %1.").arg(rc));
+				KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code was %1.").tqarg(rc));
 			}
 		}
 	}
@@ -260,7 +260,7 @@ void KWalletManager::openWalletFile(const TQString& path) {
 			this, TQT_SLOT(editorClosed(KMainWindow*)));
 		we->show();
 	} else {
-		KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path));
+		KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(path));
 		delete we;
 	}
 }
@@ -302,7 +302,7 @@ void KWalletManager::openWallet(const TQString& walletName, bool newWallet) {
 		we->show();
 		_windows.append(we);
 	} else if (!newWallet) {
-		KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(walletName));
+		KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(walletName));
 		delete we;
 	}
 }
@@ -357,14 +357,14 @@ void KWalletManager::createWallet() {
 	TQString txt = i18n("Please choose a name for the new wallet:");
 
 	if (!KWallet::Wallet::isEnabled()) {
-		// FIXME: KMessageBox::warningYesNo(this, i1_8n("KWallet is not enabled.  Do you want to enable it?"), TQString::null, i18n("Enable"), i18n("Keep Disabled"));
+		// FIXME: KMessageBox::warningYesNo(this, i1_8n("KWallet is not enabled.  Do you want to enable it?"), TQString(), i18n("Enable"), i18n("Keep Disabled"));
 		return;
 	}
 
 	do {
 		n = KInputDialog::getText(i18n("New Wallet"),
 				txt,
-				TQString::null,
+				TQString(),
 				&ok,
 				this);
 
@@ -372,12 +372,12 @@ void KWalletManager::createWallet() {
 			return;
 		}
 
-		if (_iconView->findItem(n)) {
-			int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that wallet already exists. Try a new name?"), TQString::null, i18n("Try New"), i18n("Do Not Try"));
+		if (_iconView->tqfindItem(n)) {
+			int rc = KMessageBox::questionYesNo(this, i18n("Sorry, that wallet already exists. Try a new name?"), TQString(), i18n("Try New"), i18n("Do Not Try"));
 			if (rc == KMessageBox::Yes) {
 				continue;
 			}
-			n = TQString::null;
+			n = TQString();
 		} else if (regexp.exactMatch(n)) {
 			break;
 		} else {
diff --git a/kwallet/kwalletmanager.h b/kwallet/kwalletmanager.h
index afb083e..922da8f 100644
--- a/kwallet/kwalletmanager.h
+++ b/kwallet/kwalletmanager.h
@@ -32,10 +32,11 @@ class DCOPRef;
 
 class KWalletManager : public KMainWindow, public DCOPObject {
 	Q_OBJECT
+//	TQ_OBJECT
 	K_DCOP
 
 	public:
-		KWalletManager(TQWidget *parent = 0, const char* name = 0, WFlags f = 0);
+		KWalletManager(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0);
 		virtual ~KWalletManager();
 
                 TQPixmap loadSystemTrayIcon(const TQString &icon);
diff --git a/kwallet/kwalletpopup.cpp b/kwallet/kwalletpopup.cpp
index bd5e75d..592c10e 100644
--- a/kwallet/kwalletpopup.cpp
+++ b/kwallet/kwalletpopup.cpp
@@ -28,21 +28,21 @@
 #include <kwallet.h>
 #include <kstdguiitem.h>
 
-KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name)
-: KPopupMenu(parent, name), _walletName(wallet) {
+KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *tqparent, const char *name)
+: KPopupMenu(tqparent, name), _walletName(wallet) {
 	insertTitle(wallet);
 	KActionCollection *ac = new KActionCollection(this, "kwallet context actions");
 	KAction *act;
 
-	act = new KAction(i18n("&New Wallet..."), 0, 0, this,
+	act = new KAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this),
 			TQT_SLOT(createWallet()), ac, "wallet_create");
 	act->plug(this);
 
-	act = new KAction(i18n("&Open..."), 0, Key_Return, this,
+	act = new KAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this),
 			TQT_SLOT(openWallet()), ac, "wallet_open");
 	act->plug(this);
 
-	act = new KAction(i18n("Change &Password..."), 0, 0, this,
+	act = new KAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this),
 			TQT_SLOT(changeWalletPassword()), ac, "wallet_password");
 	act->plug(this);
 
@@ -60,14 +60,14 @@ KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char
 		insertItem(i18n("Disconnec&t"), pm);
 	}
 
-	act = KStdAction::close( this,
+	act = KStdAction::close( TQT_TQOBJECT(this),
 			TQT_SLOT(closeWallet()), ac, "wallet_close");
 	// FIXME: let's track this inside the manager so we don't need a dcop
 	//        roundtrip here.
 	act->setEnabled(KWallet::Wallet::isOpen(wallet));
 	act->plug(this);
 
-	act = new KAction(i18n("&Delete"), 0, Key_Delete, this,
+	act = new KAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this),
 			TQT_SLOT(deleteWallet()), ac, "wallet_delete");
 	act->plug(this);
 }
diff --git a/kwallet/kwalletpopup.h b/kwallet/kwalletpopup.h
index 36a2d8f..3d5d83c 100644
--- a/kwallet/kwalletpopup.h
+++ b/kwallet/kwalletpopup.h
@@ -26,9 +26,10 @@
 
 class KWalletPopup : public KPopupMenu {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KWalletPopup(const TQString& wallet, TQWidget *parent = 0, const char* name = 0);
+		KWalletPopup(const TQString& wallet, TQWidget *tqparent = 0, const char* name = 0);
 		virtual ~KWalletPopup();
 
 	public slots:
diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp
index b6cbb50..3051e6c 100644
--- a/kwallet/kwmapeditor.cpp
+++ b/kwallet/kwmapeditor.cpp
@@ -31,15 +31,15 @@
 #include <tqpushbutton.h>
 #include <tqtextedit.h>
 
-KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name)
-: TQTable(0, 3, parent, name), _map(map) {
+KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *tqparent, const char *name)
+: TQTable(0, 3, tqparent, name), _map(map) {
 	_ac = new KActionCollection(this);
-	_copyAct = KStdAction::copy(this, TQT_SLOT(copy()), _ac);
+	_copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac);
 	connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty()));
 	connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)),
 		this, TQT_SLOT(contextMenu(int,int,const TQPoint&)));
 	setSelectionMode(TQTable::NoSelection);
-	horizontalHeader()->setLabel(0, TQString::null);
+	horizontalHeader()->setLabel(0, TQString());
 	horizontalHeader()->setLabel(1, i18n("Key"));
 	horizontalHeader()->setLabel(2, i18n("Value"));
 	setColumnWidth(0, 20); // FIXME: this is arbitrary
@@ -76,9 +76,9 @@ KWMapEditor::~KWMapEditor() {
 
 
 void KWMapEditor::erase() {
-	const TQObject *o = sender();
+	const TQObject *o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
 	for (int i = 0; i < numRows(); i++) {
-		if (cellWidget(i, 0) == o) {
+		if (TQT_BASE_OBJECT_CONST(cellWidget(i, 0)) == TQT_BASE_OBJECT_CONST(o)) {
 			removeRow(i);
 			break;
 		}
@@ -125,7 +125,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) {
 
 
 void KWMapEditor::copy() {
-	TQApplication::clipboard()->setText(text(_contextRow, 2));
+	TQApplication::tqclipboard()->setText(text(_contextRow, 2));
 }
 
 
@@ -140,9 +140,9 @@ class InlineEditor : public TQTextEdit {
 		virtual ~InlineEditor() { if (!_p) return; _p->setText(row, col, text()); _p->emitDirty(); }
 
 	protected:
-		virtual void focusOutEvent(TQFocusEvent*) { 
-			if (TQFocusEvent::reason() == TQFocusEvent::Popup) {
-				TQWidget *focusW = qApp->focusWidget();
+		virtual void focusOutEvent(TQFocusEvent* fe) { 
+			if (fe->reason() == TQFocusEvent::Popup) {
+				TQWidget *focusW = tqApp->tqfocusWidget();
 				if (focusW && focusW == popup) {
 					return;
 				}
@@ -150,7 +150,7 @@ class InlineEditor : public TQTextEdit {
 			close(); 
 		}
 		virtual void keyPressEvent(TQKeyEvent *e) {
-			if (e->key() == Qt::Key_Escape) {
+			if (e->key() == TQt::Key_Escape) {
 				e->accept();
 				close();
 			} else {
@@ -168,10 +168,10 @@ class InlineEditor : public TQTextEdit {
 };
 
 
-TQWidget *KWMapEditor::beginEdit(int row, int col, bool replace) {
+TQWidget *KWMapEditor::beginEdit(int row, int col, bool tqreplace) {
 	//kdDebug(2300) << "EDIT COLUMN " << col << endl;
 	if (col != 2) {
-		return TQTable::beginEdit(row, col, replace);
+		return TQTable::beginEdit(row, col, tqreplace);
 	}
 
 	TQRect geo = cellGeometry(row, col);
diff --git a/kwallet/kwmapeditor.h b/kwallet/kwmapeditor.h
index abd835f..7d1fe44 100644
--- a/kwallet/kwmapeditor.h
+++ b/kwallet/kwmapeditor.h
@@ -29,9 +29,10 @@ class KActionCollection;
 
 class KWMapEditor : public TQTable {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent = 0, const char *name = 0);
+		KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *tqparent = 0, const char *name = 0);
 		virtual ~KWMapEditor();
 
 	public slots:
@@ -46,7 +47,7 @@ class KWMapEditor : public TQTable {
 		void copy();
 
 	protected:
-		virtual TQWidget *beginEdit(int row, int col, bool replace);
+		virtual TQWidget *beginEdit(int row, int col, bool tqreplace);
 
 	signals:
 		void dirty();
diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui
index 13c6f71..07bd5d0 100644
--- a/kwallet/walletwidget.ui
+++ b/kwallet/walletwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>WalletWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>WalletWidget</cstring>
     </property>
@@ -19,14 +19,14 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QSplitter" row="0" column="0">
+        <widget class="TQSplitter" row="0" column="0">
             <property name="name">
                 <cstring>_splitter</cstring>
             </property>
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
-            <widget class="QFrame">
+            <widget class="TQFrame">
                 <property name="name">
                     <cstring>_entryListFrame</cstring>
                 </property>
@@ -45,9 +45,9 @@
                     <enum>Plain</enum>
                 </property>
             </widget>
-            <widget class="QLayoutWidget">
+            <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout3</cstring>
+                    <cstring>tqlayout3</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -82,14 +82,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>227</width>
                                 <height>21</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="3" column="1">
+                    <widget class="TQPushButton" row="3" column="1">
                         <property name="name">
                             <cstring>_undoChanges</cstring>
                         </property>
@@ -103,15 +103,15 @@
                             <iconset>"undo"</iconset>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
+                    <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
                         <property name="name">
-                            <cstring>layout2</cstring>
+                            <cstring>tqlayout2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>_iconTitle</cstring>
                                 </property>
@@ -127,7 +127,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>_entryTitle</cstring>
                                 </property>
@@ -150,13 +150,13 @@
                                 <property name="textFormat">
                                     <enum>RichText</enum>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QPushButton" row="3" column="2">
+                    <widget class="TQPushButton" row="3" column="2">
                         <property name="name">
                             <cstring>_saveChanges</cstring>
                         </property>
@@ -170,7 +170,7 @@
                             <iconset>"filesave"</iconset>
                         </property>
                     </widget>
-                    <widget class="QWidgetStack" row="2" column="0" rowspan="1" colspan="3">
+                    <widget class="TQWidgetStack" row="2" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>_entryStack</cstring>
                         </property>
@@ -182,7 +182,7 @@
                                 <verstretch>1</verstretch>
                             </sizepolicy>
                         </property>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>page</cstring>
                             </property>
@@ -190,7 +190,7 @@
                                 <number>0</number>
                             </attribute>
                         </widget>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>page</cstring>
                             </property>
@@ -204,7 +204,7 @@
                                 <property name="margin">
                                     <number>0</number>
                                 </property>
-                                <widget class="QTextEdit" row="1" column="0" rowspan="1" colspan="2">
+                                <widget class="TQTextEdit" row="1" column="0" rowspan="1" colspan="2">
                                     <property name="name">
                                         <cstring>_passwordValue</cstring>
                                     </property>
@@ -222,14 +222,14 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>271</width>
                                             <height>20</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QPushButton" row="0" column="0">
+                                <widget class="TQPushButton" row="0" column="0">
                                     <property name="name">
                                         <cstring>_hideContents</cstring>
                                     </property>
@@ -239,7 +239,7 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>page</cstring>
                             </property>
@@ -247,7 +247,7 @@
                                 <number>2</number>
                             </attribute>
                         </widget>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>page</cstring>
                             </property>
@@ -261,14 +261,14 @@
                                 <property name="margin">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel" row="1" column="1">
+                                <widget class="TQLabel" row="1" column="1">
                                     <property name="name">
                                         <cstring>textLabel1_2</cstring>
                                     </property>
                                     <property name="text">
                                         <string>This is a binary data entry.  It cannot be editted as its format is unknown and application specific.</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>WordBreak|AlignVCenter</set>
                                     </property>
                                 </widget>
@@ -282,7 +282,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>31</width>
                                             <height>41</height>
@@ -299,7 +299,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>31</width>
                                             <height>41</height>
@@ -316,7 +316,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>61</width>
                                             <height>41</height>
@@ -333,7 +333,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>41</width>
                                             <height>21</height>
@@ -342,7 +342,7 @@
                                 </spacer>
                             </grid>
                         </widget>
-                        <widget class="QWidget">
+                        <widget class="TQWidget">
                             <property name="name">
                                 <cstring>page</cstring>
                             </property>
@@ -366,7 +366,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>236</width>
                                             <height>21</height>
@@ -383,14 +383,14 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>31</width>
                                             <height>358</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QPushButton" row="0" column="0">
+                                <widget class="TQPushButton" row="0" column="0">
                                     <property name="name">
                                         <cstring>_showContents</cstring>
                                     </property>
@@ -411,6 +411,6 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
 </includes>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>